)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"7dc4f217d14c6c3bea54a88bd7713578757d274e","unresolved":false,"context_lines":[{"line_number":18,"context_line":"Closes-Bug: #1662095"},{"line_number":19,"context_line":"(cherry picked from commit b2e436aa67b373c4424cce7813ed1a0b0e54a734)"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Conflicts:"},{"line_number":22,"context_line":"\theat/engine/resource.py"},{"line_number":23,"context_line":"\theat/tests/test_engine_api_utils.py"},{"line_number":24,"context_line":"\theat/tests/test_event.py"},{"line_number":25,"context_line":"\theat/tests/test_resource.py"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"Change-Id: I0b4b983306ea84fab0e2c81876ef407a80d25989"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"da36d5c6_b16aff18","line":25,"range":{"start_line":21,"start_character":0,"end_line":25,"end_character":28},"updated":"2017-02-20 15:56:59.000000000","message":"It would be helpful to note what causes the conflicts and why it\u0027s not an issue for the backport.","commit_id":"b15d352d48010974f36669ade711721ca4b2a5fb"},{"author":{"_account_id":4328,"name":"Steven Hardy","email":"steven.hardy@suse.com","username":"shardy"},"change_message_id":"2cc8b7055229c78807f455534cd1337e6ef35dc7","unresolved":false,"context_lines":[{"line_number":18,"context_line":"Closes-Bug: #1662095"},{"line_number":19,"context_line":"(cherry picked from commit b2e436aa67b373c4424cce7813ed1a0b0e54a734)"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Conflicts:"},{"line_number":22,"context_line":"\theat/engine/resource.py"},{"line_number":23,"context_line":"\theat/tests/test_engine_api_utils.py"},{"line_number":24,"context_line":"\theat/tests/test_event.py"},{"line_number":25,"context_line":"\theat/tests/test_resource.py"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"Change-Id: I0b4b983306ea84fab0e2c81876ef407a80d25989"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ffe62b97_e07881c4","line":25,"range":{"start_line":21,"start_character":0,"end_line":25,"end_character":28},"in_reply_to":"da36d5c6_b16aff18","updated":"2017-03-30 08:12:52.000000000","message":"What kind of cause would you typically note here?  \"Code changed on newer branch hence manual conflict resolution was required?\"\n\nPersonally I think leaving these here as a warning to reviewers is enough, but perhaps there are clarifications that could be made about the resource.py change (IME test conflicts just happen due to the massive churn caused by even minor changes to the codebase).","commit_id":"b15d352d48010974f36669ade711721ca4b2a5fb"}]}
