)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"91e173da68514b4f3fa2443d401323706548c69d","unresolved":false,"context_lines":[{"line_number":23,"context_line":"Conflict File:"},{"line_number":24,"context_line":"    tox.ini due to deps used for functional tox env"},{"line_number":25,"context_line":"Change-Id: I96bb9fcb55f2a4fc3aefa01db70b45740db166c8"},{"line_number":26,"context_line":"(cherry picked from commit 9ca2345d51c9840d02dc599853ac3d10ecbaa04e)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3f4c43b2_95a5a1b8","line":26,"updated":"2020-04-13 19:58:29.000000000","message":"FYI: we usually cherry-pick from the train change to the stein branch to avoid having to re-address and re-document merge conflicts on every target branch.","commit_id":"30289d64452378d50eaaaabc1dc519e2f1d16155"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"9b151ed6c678c3b4b9337297ba15835217593d47","unresolved":false,"context_lines":[{"line_number":23,"context_line":"Conflict File:"},{"line_number":24,"context_line":"    tox.ini due to deps used for functional tox env"},{"line_number":25,"context_line":"Change-Id: I96bb9fcb55f2a4fc3aefa01db70b45740db166c8"},{"line_number":26,"context_line":"(cherry picked from commit 9ca2345d51c9840d02dc599853ac3d10ecbaa04e)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3f4c43b2_b8a094a7","line":26,"in_reply_to":"3f4c43b2_95a5a1b8","updated":"2020-04-13 21:09:18.000000000","message":"that still shows conflict, let me do once train change is merged.","commit_id":"30289d64452378d50eaaaabc1dc519e2f1d16155"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"00a8cc324f678e085bc7843398a804357b6a5afd","unresolved":false,"context_lines":[{"line_number":23,"context_line":"Conflict File:"},{"line_number":24,"context_line":"    tox.ini due to deps used for functional tox env"},{"line_number":25,"context_line":"Change-Id: I96bb9fcb55f2a4fc3aefa01db70b45740db166c8"},{"line_number":26,"context_line":"(cherry picked from commit 9ca2345d51c9840d02dc599853ac3d10ecbaa04e)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"3f4c43b2_183b8838","line":26,"in_reply_to":"3f4c43b2_b8a094a7","updated":"2020-04-13 21:30:37.000000000","message":"Yeah, unfortunately the cherry-pick via the gerrit UI will only work that way once the train change merges. The only way to do it before merge is to do it manually locally and then uploading it.\n\nSo yes, sounds like a good idea to wait until it merges and just use gerrit UI, since we have to wait anyway.","commit_id":"30289d64452378d50eaaaabc1dc519e2f1d16155"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"39d4be7ec2b3cc2b77508899425467cae3f0dd33","unresolved":false,"context_lines":[{"line_number":24,"context_line":"Conflicts:"},{"line_number":25,"context_line":"    tox.ini due to deps used for functional tox env"},{"line_number":26,"context_line":"Change-Id: I96bb9fcb55f2a4fc3aefa01db70b45740db166c8"},{"line_number":27,"context_line":"(cherry picked from commit fd92f836f3926c3c2d769c5f0774144d359e4ffe)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":3,"id":"3f4c43b2_2c92514c","line":27,"updated":"2020-04-16 08:36:39.000000000","message":"nit: this hash is from the patch in master branch. Patches should have been cherry-picked branch-by-branch.","commit_id":"7df3d9fbb91ed07b0e0eaa763ba2084b4de5798c"}]}