)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"296295ad1273d6b8dd975d8301f50252b01cc25d","unresolved":false,"context_lines":[{"line_number":79,"context_line":"which is something Vim, for example, won\u0027t even let you do without"},{"line_number":80,"context_line":"setting special flags - and therefore it can be reasonably ignored."},{"line_number":81,"context_line":""},{"line_number":82,"context_line":"Conflicts:"},{"line_number":83,"context_line":"\tnova/tests/unit/test_hacking.py"},{"line_number":84,"context_line":""},{"line_number":85,"context_line":"NOTE(stephenfin): Conflicts are because we don\u0027t have change"},{"line_number":86,"context_line":"I35c654bd39f343417e0a1124263ff31dcd0b05c9 (\"Bump to hacking 1.1.0\") or"},{"line_number":87,"context_line":"change I8826c3fb89690805baae6b9b7b48985abb8d62d3 (\"Skip"},{"line_number":88,"context_line":"test_check_doubled_words hacking check UT\") on this branch."},{"line_number":89,"context_line":""},{"line_number":90,"context_line":"[1] https://bugs.python.org/issue33899"},{"line_number":91,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9fb8cfa7_73253eab","line":88,"range":{"start_line":82,"start_character":0,"end_line":88,"end_character":59},"updated":"2019-06-18 00:02:32.000000000","message":"And then remove the conflict notes because a cherry-pick from stable/rocky should apply cleanly on queens.","commit_id":"59ec7d63d964752036d81f903ccc7c25982786c1"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"296295ad1273d6b8dd975d8301f50252b01cc25d","unresolved":false,"context_lines":[{"line_number":92,"context_line":"Change-Id: Ia597594e0469c0e83d7ad22b0678390aaebaffe7"},{"line_number":93,"context_line":"Signed-off-by: Stephen Finucane \u003csfinucan@redhat.com\u003e"},{"line_number":94,"context_line":"Closes-Bug: #1804062"},{"line_number":95,"context_line":"(cherry picked from f545a25cc443c41dcd9bdd028064c28b53f56037)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9fb8cfa7_f317ee44","line":95,"updated":"2019-06-18 00:02:32.000000000","message":"I think we should \u0027cherry-pick -x\u0027 this from the stable/rocky change, it is a clean backport that way.","commit_id":"59ec7d63d964752036d81f903ccc7c25982786c1"}]}