)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"03ea55c169e40773dd9c5805e99c2a638cdd7133","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"It\u0027s false by default so nothing changes."},{"line_number":14,"context_line":""},{"line_number":15,"context_line":"Conflicts:"},{"line_number":16,"context_line":"\tmanifests/controller.pp"},{"line_number":17,"context_line":"\tspec/classes/ovn_controller_spec.rb"},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"Change-Id: I884a1bd836d21fba520bf5a6c17ff2bdc949e31f"},{"line_number":20,"context_line":"(cherry picked from commit 392ad7946ef5c7659f9320a3f832245e21f8365f)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"0311e612_731ff8ea","line":17,"range":{"start_line":15,"start_character":0,"end_line":17,"end_character":36},"updated":"2022-02-11 14:26:20.000000000","message":"This is what I was requesting.","commit_id":"f30b76a657349fe5a98dc0e97ee130f088677235"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":8297,"name":"Sofer Athlan-Guyot","email":"sathlang@redhat.com","username":"chem"},"change_message_id":"b4602cbf36c89c64e5b9e011ceefe2367a8eeb54","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"d85b1390_c250bc96","updated":"2022-02-11 12:20:02.000000000","message":"Conflict resolution in the other way[0]. I think it\u0027s fine.\n\n[0] see https://review.opendev.org/c/openstack/puppet-ovn/+/782759 for instance 😊","commit_id":"33e3893564d35ec592e125f137076fb610e45f79"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"0dd98641b1f5a869d42ec9021d5f774e34370a9a","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"fc1871cf_9cb0743f","updated":"2022-02-11 13:02:42.000000000","message":"I tried this backport in my local but it failed because of conflict.\nPlease list up files about which conflicts are detected.","commit_id":"33e3893564d35ec592e125f137076fb610e45f79"},{"author":{"_account_id":8297,"name":"Sofer Athlan-Guyot","email":"sathlang@redhat.com","username":"chem"},"change_message_id":"fee3f01b06c174c1699f5095dbd9ddf4703183f1","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"2a10942d_cd53023a","in_reply_to":"0fd7354d_bcc43d67","updated":"2022-02-11 17:08:20.000000000","message":"Thanks, noted for next time.","commit_id":"33e3893564d35ec592e125f137076fb610e45f79"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"d0927387a219af4c8515d060c216b0e6dc7ceb89","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"0fd7354d_bcc43d67","in_reply_to":"d12528d9_48736f13","updated":"2022-02-11 14:34:42.000000000","message":"Done","commit_id":"33e3893564d35ec592e125f137076fb610e45f79"},{"author":{"_account_id":8297,"name":"Sofer Athlan-Guyot","email":"sathlang@redhat.com","username":"chem"},"change_message_id":"a5837b43d27f5a221182b81ef34e04d6b19a7229","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":3,"id":"900e3b40_4938688e","in_reply_to":"fc1871cf_9cb0743f","updated":"2022-02-11 13:56:55.000000000","message":"Those are the opposite of the resolution done there https://review.opendev.org/c/openstack/puppet-ovn/+/782759 which basically \"created\" the conflict.\n\nDo you want me to mention it the same in the commit message ?  Basically we now \"unconflict\" the file and it looks like master.","commit_id":"33e3893564d35ec592e125f137076fb610e45f79"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"68b842787b0119c05bf745176fce73ffd30dca15","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":3,"id":"d12528d9_48736f13","in_reply_to":"fc1871cf_9cb0743f","updated":"2022-02-11 14:20:40.000000000","message":"What I\u0027m requesting here is to include list of the files where conflicts are detected in the commit message, as is done for that patch you mentioned.\n\nThat helps us understand whether we need additional caution to ensure the conflicts are resolved correctly.","commit_id":"33e3893564d35ec592e125f137076fb610e45f79"}]}