)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":27615,"name":"Rajat Dhasmana","email":"rajatdhasmana@gmail.com","username":"whoami-rajat"},"change_message_id":"d7644d16df4def89502103a711ac4030b4e41904","unresolved":true,"context_lines":[{"line_number":41,"context_line":"(cherry picked from commit 49a2c85eda9fd3cddc75fd904fe62c87a6b50735)"},{"line_number":42,"context_line":"(cherry picked from commit 5db58159feec3d2d39d1abf3637310f5ac60a3cf)"},{"line_number":43,"context_line":"Conflicts:"},{"line_number":44,"context_line":"\tcinder/tests/unit/volume/drivers/test_rbd.py"},{"line_number":45,"context_line":"(cherry picked from commit 07ead73eec0ac6b962b533b07861d6a81226fa37)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"a852f638_12b9d270","line":44,"range":{"start_line":44,"start_character":1,"end_line":44,"end_character":45},"updated":"2021-09-22 15:36:42.000000000","message":"I\u0027m not sure but do we mention conflicts from Original patch in master or the branch we backported from (in this case stable/victoria) ?","commit_id":"06b32da4be8b69e626eb7eb8091f695cbdcd92e7"},{"author":{"_account_id":10459,"name":"Luigi Toscano","email":"ltoscano@redhat.com","username":"ltoscano"},"change_message_id":"354edb946ab2f8a22f98e9918b95c7fb6dc37995","unresolved":true,"context_lines":[{"line_number":41,"context_line":"(cherry picked from commit 49a2c85eda9fd3cddc75fd904fe62c87a6b50735)"},{"line_number":42,"context_line":"(cherry picked from commit 5db58159feec3d2d39d1abf3637310f5ac60a3cf)"},{"line_number":43,"context_line":"Conflicts:"},{"line_number":44,"context_line":"\tcinder/tests/unit/volume/drivers/test_rbd.py"},{"line_number":45,"context_line":"(cherry picked from commit 07ead73eec0ac6b962b533b07861d6a81226fa37)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"38a4c439_f256742c","line":44,"range":{"start_line":44,"start_character":1,"end_line":44,"end_character":45},"in_reply_to":"a852f638_12b9d270","updated":"2021-09-22 18:19:50.000000000","message":"Good question, I wasn\u0027t sure. I\u0027ve seen those \"interleaved\" conflict lines.\n\nI\u0027m ready to follow whatever guideline is correct.","commit_id":"06b32da4be8b69e626eb7eb8091f695cbdcd92e7"},{"author":{"_account_id":5314,"name":"Brian Rosmaita","email":"rosmaita.fossdev@gmail.com","username":"brian-rosmaita"},"change_message_id":"b9a136d2261067b5af07b00a52e10a998daa6dd8","unresolved":true,"context_lines":[],"source_content_type":"","patch_set":1,"id":"683805c6_ffa790d3","line":46,"updated":"2021-09-23 15:23:36.000000000","message":"I think what Luigi has here is fine.  This is the way I read it:\n\n  master -\u003e original patch, no c-p message\n  wallaby -\u003e (cherry picked from master commit)\n  victoria -\u003e (cherry picked from wallaby commit)\n               and had to resolve conflict\n  ussuri -\u003e (cherry picked from victoria commit)\n\nSo this tells us that the ussuri patch is exactly like the victoria patch (and hence different from the wallaby and master patches in exactly the same way).","commit_id":"06b32da4be8b69e626eb7eb8091f695cbdcd92e7"},{"author":{"_account_id":27615,"name":"Rajat Dhasmana","email":"rajatdhasmana@gmail.com","username":"whoami-rajat"},"change_message_id":"bc9b46fc628b6af999576db771cb70f0dce56839","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"df37f2a9_5df9faa0","line":46,"in_reply_to":"683805c6_ffa790d3","updated":"2021-09-23 15:30:18.000000000","message":"Ack, makes sense to me. Thanks for the input","commit_id":"06b32da4be8b69e626eb7eb8091f695cbdcd92e7"}]}