)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"c3d8ea18b7189b5aebdfd1daf8fcde01af591823","unresolved":false,"context_lines":[{"line_number":12,"context_line":"Follow up the comment:"},{"line_number":13,"context_line":"https://review.opendev.org/#/c/715326/22/nova/compute/api.py@3907"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Co-Authored-By: Wenping Song \u003csongwenping@inspur.com\u003e"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Closes-Bug: #1893751"},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"Conflicts:"},{"line_number":20,"context_line":"  nova/compute/api.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_db90a798","line":17,"range":{"start_line":15,"start_character":0,"end_line":17,"end_character":20},"updated":"2020-09-03 10:04:51.000000000","message":"This belongs at the bottom with the change-id/signed-off-by lines","commit_id":"dbb1aa41ef172688d34592cf29f3928f86ece383"},{"author":{"_account_id":26458,"name":"Brin Zhang","email":"zhangbailin@inspur.com","username":"zhangbailin"},"change_message_id":"bdf16b0267680db6ab079cee25dede30a6d3ee3b","unresolved":false,"context_lines":[{"line_number":12,"context_line":"Follow up the comment:"},{"line_number":13,"context_line":"https://review.opendev.org/#/c/715326/22/nova/compute/api.py@3907"},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Co-Authored-By: Wenping Song \u003csongwenping@inspur.com\u003e"},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"Closes-Bug: #1893751"},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"Conflicts:"},{"line_number":20,"context_line":"  nova/compute/api.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_db6c279e","line":17,"range":{"start_line":15,"start_character":0,"end_line":17,"end_character":20},"in_reply_to":"9f560f44_db90a798","updated":"2020-09-03 10:08:28.000000000","message":"Done","commit_id":"dbb1aa41ef172688d34592cf29f3928f86ece383"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"c3d8ea18b7189b5aebdfd1daf8fcde01af591823","unresolved":false,"context_lines":[{"line_number":22,"context_line":""},{"line_number":23,"context_line":"NOTE(brinzhang): Conflicts are due to change"},{"line_number":24,"context_line":"eef4b5435e7cdfe53ee9d9265d96c7dd278d9e93 (\"api: Reject"},{"line_number":25,"context_line":"non-spawn operations for vTPM\") which is change to the"},{"line_number":26,"context_line":"same location."},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Change-Id: I74d3402d564abd5b042024d59c7a55511afa6bf9"},{"line_number":29,"context_line":"Signed-off-by: zhangbailin \u003czhangbailin@inspur.com\u003e"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_fbeacb0b","line":26,"range":{"start_line":25,"start_character":38,"end_line":26,"end_character":14},"updated":"2020-09-03 10:04:51.000000000","message":"modified the same code.","commit_id":"dbb1aa41ef172688d34592cf29f3928f86ece383"},{"author":{"_account_id":26458,"name":"Brin Zhang","email":"zhangbailin@inspur.com","username":"zhangbailin"},"change_message_id":"bdf16b0267680db6ab079cee25dede30a6d3ee3b","unresolved":false,"context_lines":[{"line_number":22,"context_line":""},{"line_number":23,"context_line":"NOTE(brinzhang): Conflicts are due to change"},{"line_number":24,"context_line":"eef4b5435e7cdfe53ee9d9265d96c7dd278d9e93 (\"api: Reject"},{"line_number":25,"context_line":"non-spawn operations for vTPM\") which is change to the"},{"line_number":26,"context_line":"same location."},{"line_number":27,"context_line":""},{"line_number":28,"context_line":"Change-Id: I74d3402d564abd5b042024d59c7a55511afa6bf9"},{"line_number":29,"context_line":"Signed-off-by: zhangbailin \u003czhangbailin@inspur.com\u003e"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_1b04dfc5","line":26,"range":{"start_line":25,"start_character":38,"end_line":26,"end_character":14},"in_reply_to":"9f560f44_fbeacb0b","updated":"2020-09-03 10:08:28.000000000","message":"Done","commit_id":"dbb1aa41ef172688d34592cf29f3928f86ece383"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"c3d8ea18b7189b5aebdfd1daf8fcde01af591823","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"9f560f44_1b833f58","line":30,"updated":"2020-09-03 10:04:51.000000000","message":"You\u0027re missing the \u0027cherry picked from\u0027 footer","commit_id":"dbb1aa41ef172688d34592cf29f3928f86ece383"},{"author":{"_account_id":26458,"name":"Brin Zhang","email":"zhangbailin@inspur.com","username":"zhangbailin"},"change_message_id":"bdf16b0267680db6ab079cee25dede30a6d3ee3b","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"9f560f44_fb064bcd","line":30,"in_reply_to":"9f560f44_1b833f58","updated":"2020-09-03 10:08:28.000000000","message":"Done","commit_id":"dbb1aa41ef172688d34592cf29f3928f86ece383"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"0cffa62bc2afbb3866867ff2d6b8bb84c6dd7e59","unresolved":false,"context_lines":[{"line_number":23,"context_line":"Co-Authored-By: Wenping Song \u003csongwenping@inspur.com\u003e"},{"line_number":24,"context_line":"Closes-Bug: #1893751"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Change-Id: I74d3402d564abd5b042024d59c7a55511afa6bf9"},{"line_number":27,"context_line":"Signed-off-by: zhangbailin \u003czhangbailin@inspur.com\u003e"},{"line_number":28,"context_line":"(cherry picked from commit dbb1aa41ef172688d34592cf29f3928f86ece383)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9f560f44_bb985375","line":26,"range":{"start_line":26,"start_character":11,"end_line":26,"end_character":52},"updated":"2020-09-03 10:13:42.000000000","message":"You\u0027ve generated a new change-id. You should have used the same one as previously.\n\n  git checkout stable/ussuri\n  git cherry-pick -x 97267fc05c60b60761ebe8ec2773e8920148ae06\n  # resolve conflicts\n  git commit\n  # add \u0027Conflicts\u0027 and \u0027NOTE\u0027 sections","commit_id":"edfef526b538f2bd349eaeed2ee2d39cfb056a96"},{"author":{"_account_id":26458,"name":"Brin Zhang","email":"zhangbailin@inspur.com","username":"zhangbailin"},"change_message_id":"67bc385e51c18c8f5c23e04442a1d6feb0ac4127","unresolved":false,"context_lines":[{"line_number":23,"context_line":"Co-Authored-By: Wenping Song \u003csongwenping@inspur.com\u003e"},{"line_number":24,"context_line":"Closes-Bug: #1893751"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Change-Id: I74d3402d564abd5b042024d59c7a55511afa6bf9"},{"line_number":27,"context_line":"Signed-off-by: zhangbailin \u003czhangbailin@inspur.com\u003e"},{"line_number":28,"context_line":"(cherry picked from commit dbb1aa41ef172688d34592cf29f3928f86ece383)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9f560f44_5b5bf785","line":26,"range":{"start_line":26,"start_character":11,"end_line":26,"end_character":52},"in_reply_to":"9f560f44_bb985375","updated":"2020-09-03 10:25:31.000000000","message":"yeah, after resolve conflicts we also need to run:\ngit add \u003cchanged files\u003e","commit_id":"edfef526b538f2bd349eaeed2ee2d39cfb056a96"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"0cffa62bc2afbb3866867ff2d6b8bb84c6dd7e59","unresolved":false,"context_lines":[{"line_number":25,"context_line":""},{"line_number":26,"context_line":"Change-Id: I74d3402d564abd5b042024d59c7a55511afa6bf9"},{"line_number":27,"context_line":"Signed-off-by: zhangbailin \u003czhangbailin@inspur.com\u003e"},{"line_number":28,"context_line":"(cherry picked from commit dbb1aa41ef172688d34592cf29f3928f86ece383)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"9f560f44_bbc33357","line":28,"range":{"start_line":28,"start_character":27,"end_line":28,"end_character":67},"updated":"2020-09-03 10:13:42.000000000","message":"This is the commit ID of this change","commit_id":"edfef526b538f2bd349eaeed2ee2d39cfb056a96"}]}