)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"1e0c3c78c6935b12c4c3da1307ecfb98d67c18ef","unresolved":false,"context_lines":[{"line_number":27,"context_line":"re-use some kind of event that we could generate from the"},{"line_number":28,"context_line":"compute service, e.g. compute__do_build_and_run_instance."},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"NOTE(mriedem): A couple of helper method calls in the test had"},{"line_number":31,"context_line":"to be updated since change I8c96b337f32148f8f5899c9b87af331b1fa41424"},{"line_number":32,"context_line":"is not in Train."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"Change-Id: I1e9431e739adfbcfc1ca34b87e826a516a4b18e2"},{"line_number":35,"context_line":"Closes-Bug: #1852458"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_1498a073","line":32,"range":{"start_line":30,"start_character":0,"end_line":32,"end_character":16},"updated":"2020-01-09 13:06:42.000000000","message":"Missing the Conflicts section here but IMHO that isn\u0027t as important as the note explaining the actual reason for the conflict so I\u0027m fine without it.","commit_id":"6484d9ff5b03f7b7d8e9ba296f7f32d2e54fcc11"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"84b9a3289f651a2490b5faa68bb8999276af1fc7","unresolved":false,"context_lines":[{"line_number":27,"context_line":"re-use some kind of event that we could generate from the"},{"line_number":28,"context_line":"compute service, e.g. compute__do_build_and_run_instance."},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"NOTE(mriedem): A couple of helper method calls in the test had"},{"line_number":31,"context_line":"to be updated since change I8c96b337f32148f8f5899c9b87af331b1fa41424"},{"line_number":32,"context_line":"is not in Train."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"Change-Id: I1e9431e739adfbcfc1ca34b87e826a516a4b18e2"},{"line_number":35,"context_line":"Closes-Bug: #1852458"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_cf8cb52f","line":32,"range":{"start_line":30,"start_character":0,"end_line":32,"end_character":16},"in_reply_to":"3fa7e38b_1498a073","updated":"2020-01-09 13:56:15.000000000","message":"Because it\u0027s not a conflict. The backport is clean but the test helper interfaces changed.","commit_id":"6484d9ff5b03f7b7d8e9ba296f7f32d2e54fcc11"},{"author":{"_account_id":10135,"name":"Lee Yarwood","display_name":"Lee Yarwood","email":"lyarwood@redhat.com","username":"lyarwood"},"change_message_id":"70e6a5a20760c42abadb45a92b0704a1bd4fcf5d","unresolved":false,"context_lines":[{"line_number":27,"context_line":"re-use some kind of event that we could generate from the"},{"line_number":28,"context_line":"compute service, e.g. compute__do_build_and_run_instance."},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"NOTE(mriedem): A couple of helper method calls in the test had"},{"line_number":31,"context_line":"to be updated since change I8c96b337f32148f8f5899c9b87af331b1fa41424"},{"line_number":32,"context_line":"is not in Train."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":"Change-Id: I1e9431e739adfbcfc1ca34b87e826a516a4b18e2"},{"line_number":35,"context_line":"Closes-Bug: #1852458"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_0fde4dda","line":32,"range":{"start_line":30,"start_character":0,"end_line":32,"end_character":16},"in_reply_to":"3fa7e38b_cf8cb52f","updated":"2020-01-09 14:15:12.000000000","message":"I\u0027ve always overloaded the term to also cover anything where  changes are required for the change to be useful on the branch but yeah you\u0027re correct, there are no conflicts during the cherry-pick.","commit_id":"6484d9ff5b03f7b7d8e9ba296f7f32d2e54fcc11"}]}