)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":7634,"name":"Takashi Natsume","email":"takanattie@gmail.com","username":"natsumet"},"change_message_id":"6218fe2b80fbafbc575a1f5624b2a4c9ada4d7f5","unresolved":false,"context_lines":[{"line_number":14,"context_line":"While other approaches are possible for solving the issue,"},{"line_number":15,"context_line":"The approach proposed in the series allows the fix to be safely"},{"line_number":16,"context_line":"backported."},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Change-Id: Id3c4d839fb1a6da47cfb366b65c0904d281a218f"},{"line_number":19,"context_line":"Closes-Bug: #1809095"},{"line_number":20,"context_line":"(cherry picked from commit 000e93df09fd4941bb69f715c955b940871a1ec6)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"bfb3d3c7_b6231b56","line":17,"updated":"2019-05-27 13:34:19.000000000","message":"Conflicts should be noted in the commit message.","commit_id":"0fda00793ccc18c045edfb5bf7b5f2382993d479"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"8443889726b57a74441b9fe3cb1126c37abe70e5","unresolved":false,"context_lines":[{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Closes-Bug: #1809095"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Conflicts:"},{"line_number":21,"context_line":"    nova/tests/unit/compute/test_compute_mgr.py"},{"line_number":22,"context_line":""},{"line_number":23,"context_line":"Change-Id: Id3c4d839fb1a6da47cfb366b65c0904d281a218f"},{"line_number":24,"context_line":"(cherry picked from commit 000e93df09fd4941bb69f715c955b940871a1ec6)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"bfb3d3c7_40b447d1","line":21,"range":{"start_line":20,"start_character":0,"end_line":21,"end_character":47},"updated":"2019-05-28 14:32:54.000000000","message":"Any idea what the conflict is?","commit_id":"77a339c4e8d51de82cd6c4530b8473cc8bb6aea8"}]}