)]}'
{"doc/source/stable-branches.rst":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"f8d4e0e7b77ec048c824b713ce1bdf76ea5839a0","unresolved":false,"context_lines":[{"line_number":362,"context_line":"resolving the conflicts yourself and proposing the resulting patch. Please keep"},{"line_number":363,"context_line":"\"Conflicts\" lines in the commit message to help reviewers, for example:"},{"line_number":364,"context_line":"https://review.opendev.org/686292/"},{"line_number":365,"context_line":""},{"line_number":366,"context_line":"Change-Ids"},{"line_number":367,"context_line":"----------"},{"line_number":368,"context_line":"When cherry-picking a commit, keep the original :code:`Change-Id` and gerrit"}],"source_content_type":"text/x-rst","patch_set":2,"id":"3fa7e38b_d53dcd8e","line":365,"updated":"2019-11-11 14:36:58.000000000","message":"Maybe one more thing to add: what to do with the conflicts lines if that comes from a previous cherry-pick (i.e.: remove them if they are not valid anymore)","commit_id":"0e80c32f56a013b99fa9118a90277295e9fa2e23"}]}