)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"4b6f8df038536ec153b7e56c40f3c9518140e8dd","unresolved":false,"context_lines":[{"line_number":26,"context_line":""},{"line_number":27,"context_line":"Conflicts:"},{"line_number":28,"context_line":" nova/tests/unit/compute/test_resource_tracker.py"},{"line_number":29,"context_line":" nova/tests/unit/virt/test_hardware.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"Change-Id: Id40440cdf31b3cc32a899bfd694b537a70703e9c"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"df33271e_d0a2f8fb","line":29,"updated":"2020-03-31 20:00:41.000000000","message":"With our process we\u0027ll need to add a NOTE here explaining what caused the conflicts listed here before merge.","commit_id":"2e5753eba530c1fc48477dee402553743537d4f6"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"ead9bd3d74aa61c8ac1c30da380a3d1d9fdf3e13","unresolved":false,"context_lines":[{"line_number":28,"context_line":" nova/tests/unit/compute/test_resource_tracker.py"},{"line_number":29,"context_line":" nova/tests/unit/virt/test_hardware.py"},{"line_number":30,"context_line":""},{"line_number":31,"context_line":"Change-Id: Id40440cdf31b3cc32a899bfd694b537a70703e9c"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"df33271e_bfdef33a","line":31,"range":{"start_line":31,"start_character":11,"end_line":31,"end_character":52},"updated":"2020-04-02 13:10:20.000000000","message":"The change ID should be I5f5c621f2f0fa1bc18ee9a97d17085107a5dee53 as in the original patch.","commit_id":"2e5753eba530c1fc48477dee402553743537d4f6"}]}