)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"babe716d9aaff9c56f5b39ec865b76030b236589","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_acfe3968","line":21,"range":{"start_line":20,"start_character":0,"end_line":21,"end_character":47},"updated":"2019-05-30 08:06:20.000000000","message":"nit - We typically add a NOTE section documenting what the actual conflict is along with this line, if you need to rebase/respin please add that in here.","commit_id":"af03e379edfdcbc69b681f151682c1a34d8f78a1"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"5cf03ea1d3140fabd696df4bd4c3128d4ed1116c","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Conflicts in unit tests were trivial to solve"},{"line_number":21,"context_line":"no changes in test logic."},{"line_number":22,"context_line":""},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"    nova/tests/unit/compute/test_compute.py"},{"line_number":25,"context_line":"    nova/tests/unit/compute/test_compute_mgr.py"},{"line_number":26,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"9fb8cfa7_287b39be","line":23,"updated":"2019-06-11 21:34:13.000000000","message":"Looks like these are due to Ibb8c12fb2799bb5ceb9e3d72a2b86dbb4f14451e.","commit_id":"841d7d329df6832dcadcd9a1d59b1cf7c758209b"}]}