)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"7ba7c318e61a4787bcb0f218a0a8375c7f314392","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Related-To: https://review.opendev.org/#/c/404623/"},{"line_number":21,"context_line":"Change-Id: I8e400da9445101b9ff5240511c56105e26e16e4c"},{"line_number":22,"context_line":"Closes-Bug: #1851425"},{"line_number":23,"context_line":"(cherry picked from commit aa39641182e32b86d3585dfa69cf0862610968b6)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_c8d233d2","line":23,"updated":"2019-11-07 16:20:18.000000000","message":"We should cherry-pick from the preceding branch which is stable/stein in this case.","commit_id":"3dc418c89088512bbfd315e4d9b3cbe26b5d6144"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"f34138f5ab6830e58996312cb7997e7ad0819297","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Related-To: https://review.opendev.org/#/c/404623/"},{"line_number":21,"context_line":"Change-Id: I8e400da9445101b9ff5240511c56105e26e16e4c"},{"line_number":22,"context_line":"Closes-Bug: #1851425"},{"line_number":23,"context_line":"(cherry picked from commit aa39641182e32b86d3585dfa69cf0862610968b6)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_2b198179","line":23,"in_reply_to":"3fa7e38b_08f28b70","updated":"2019-11-07 16:35:37.000000000","message":"\u003e I see this mentions keeping the conflicts in the commit message:\n \u003e \n \u003e https://docs.openstack.org/project-team-guide/stable-branches.html#proposing-fixes\n \u003e \n \u003e But there isn\u0027t really a good example for that, we should add an\n \u003e example. I can do that. For example: https://review.opendev.org/#/c/692631/\n\nhttps://review.opendev.org/#/c/693384/","commit_id":"3dc418c89088512bbfd315e4d9b3cbe26b5d6144"},{"author":{"_account_id":27478,"name":"Archit Modi","email":"amodi@redhat.com","username":"amodi"},"change_message_id":"06cba39ae0792e405f92ad87877d116f8abbc719","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Related-To: https://review.opendev.org/#/c/404623/"},{"line_number":21,"context_line":"Change-Id: I8e400da9445101b9ff5240511c56105e26e16e4c"},{"line_number":22,"context_line":"Closes-Bug: #1851425"},{"line_number":23,"context_line":"(cherry picked from commit aa39641182e32b86d3585dfa69cf0862610968b6)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_593da8ba","line":23,"in_reply_to":"3fa7e38b_2b198179","updated":"2019-11-08 13:57:12.000000000","message":"Done, thanks!","commit_id":"3dc418c89088512bbfd315e4d9b3cbe26b5d6144"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"10938e93d033b47774b42e51b2a62e9db3c60a26","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Related-To: https://review.opendev.org/#/c/404623/"},{"line_number":21,"context_line":"Change-Id: I8e400da9445101b9ff5240511c56105e26e16e4c"},{"line_number":22,"context_line":"Closes-Bug: #1851425"},{"line_number":23,"context_line":"(cherry picked from commit aa39641182e32b86d3585dfa69cf0862610968b6)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3fa7e38b_08f28b70","line":23,"in_reply_to":"3fa7e38b_c8d233d2","updated":"2019-11-07 16:23:23.000000000","message":"Actually there is a merge conflict cherry-picking from stein, which means there was a conflict when you cherry-picked this from master but didn\u0027t document it in the commit message which is something we generally do (but probably not documented?).\n\nWhat you\u0027d normally do is copy the \"Conflicts\" message from the git commit command and copy that into the commit message with a NOTE about what caused the conflict, which is generally just saying change XYZ isn\u0027t in $current_branch.\n\n(later)\n\nI see this mentions keeping the conflicts in the commit message:\n\nhttps://docs.openstack.org/project-team-guide/stable-branches.html#proposing-fixes\n\nBut there isn\u0027t really a good example for that, we should add an example. I can do that. For example: https://review.opendev.org/#/c/692631/","commit_id":"3dc418c89088512bbfd315e4d9b3cbe26b5d6144"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"a0e8425d227b8da4f23c6af51f4c2ea99bfe1dea","unresolved":false,"context_lines":[{"line_number":19,"context_line":"      doc/source/user/launch-instance-from-volume.rst"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(amodi): The conflict is due to not having"},{"line_number":22,"context_line":"16027094ebabc5cd9f2e766431f18aadeff54a40 commit in Rocky"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"[1] https://review.opendev.org/#/c/404623/"},{"line_number":25,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_af42560e","line":22,"updated":"2019-11-08 03:13:41.000000000","message":"Wouldn\u0027t it be good to have this also? Why not backport this and your fix on top so we have both and avoid the merge conflict?","commit_id":"a6d245aa41ae0de2da7ef387fae1aa8745e9956d"},{"author":{"_account_id":27478,"name":"Archit Modi","email":"amodi@redhat.com","username":"amodi"},"change_message_id":"0e25014d8a319194ed4712702a4b88fad4141ee7","unresolved":false,"context_lines":[{"line_number":19,"context_line":"      doc/source/user/launch-instance-from-volume.rst"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(amodi): The conflict is due to not having"},{"line_number":22,"context_line":"16027094ebabc5cd9f2e766431f18aadeff54a40 commit in Rocky"},{"line_number":23,"context_line":""},{"line_number":24,"context_line":"[1] https://review.opendev.org/#/c/404623/"},{"line_number":25,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3fa7e38b_f4b9f9ca","line":22,"in_reply_to":"3fa7e38b_af42560e","updated":"2019-11-08 15:58:38.000000000","message":"yes sounds good","commit_id":"a6d245aa41ae0de2da7ef387fae1aa8745e9956d"}]}