)]}'
{"id":"openstack%2Fproject-team-guide~693384","triplet_id":"openstack%2Fproject-team-guide~master~I550024dce50d19ac3dbbb6619159fafd8df8c314","project":"openstack/project-team-guide","branch":"master","topic":"stable-conflicts","hashtags":[],"change_id":"I550024dce50d19ac3dbbb6619159fafd8df8c314","subject":"Give an example of dealing with backport conflicts","status":"MERGED","created":"2019-11-07 16:30:37.000000000","updated":"2019-11-12 12:54:11.000000000","submitted":"2019-11-12 09:50:52.000000000","submitter":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"total_comment_count":1,"unresolved_comment_count":0,"has_review_started":true,"submission_id":"693384-1573552252013-b5833ee5","meta_rev_id":"1ae6608874ff14f87c0a5baf416d3d780d66976f","_number":693384,"virtual_id_number":693384,"owner":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"actions":{},"labels":{"Verified":{"approved":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"all":[{"tag":"autogenerated:zuul:gate","value":2,"date":"2019-11-12 09:50:51.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},{"value":0,"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"},{"value":0,"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},{"value":0,"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},{"value":0,"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"}],"values":{"-2":"Fails","-1":"Doesn\u0027t seem to work"," 0":"No score","+1":"Works for me","+2":"Verified"},"description":"","default_value":0,"optional":true},"Code-Review":{"approved":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"all":[{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":2,"date":"2019-11-07 16:35:00.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},{"value":1,"date":"2019-11-11 14:53:39.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"},{"value":2,"date":"2019-11-12 09:46:46.000000000","permitted_voting_range":{"min":2,"max":2},"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},{"value":1,"date":"2019-11-11 14:32:28.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},{"value":1,"date":"2019-11-07 22:09:40.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"}],"values":{"-2":"Do not merge","-1":"This patch needs further work before it can be merged"," 0":"No score","+1":"Looks good to me, but someone else must approve","+2":"Looks good to me (core reviewer)"},"description":"","default_value":0,"optional":true},"Workflow":{"approved":{"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},"all":[{"value":0,"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"value":0,"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},{"value":0,"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"},{"value":1,"date":"2019-11-12 09:46:46.000000000","permitted_voting_range":{"min":1,"max":1},"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},{"value":0,"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},{"value":0,"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"}],"values":{"-1":"Work in progress"," 0":"Ready for reviews","+1":"Approved"},"description":"","default_value":0,"optional":true}},"removable_reviewers":[],"reviewers":{"REVIEWER":[{"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},{"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"}]},"pending_reviewers":{},"reviewer_updates":[{"updated":"2019-11-07 16:35:00.000000000","updated_by":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"reviewer":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"state":"REVIEWER"},{"updated":"2019-11-07 22:09:40.000000000","updated_by":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"reviewer":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"state":"REVIEWER"},{"updated":"2019-11-11 14:32:28.000000000","updated_by":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"reviewer":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"state":"REVIEWER"},{"updated":"2019-11-11 14:53:39.000000000","updated_by":{"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"},"reviewer":{"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"},"state":"REVIEWER"},{"updated":"2019-11-12 09:46:46.000000000","updated_by":{"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},"reviewer":{"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},"state":"REVIEWER"},{"updated":"2019-11-12 09:50:51.000000000","updated_by":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"reviewer":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"state":"REVIEWER"}],"messages":[{"id":"0e80af8609c27590f66f46fcc53d33f41cedca5c","author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"date":"2019-11-07 16:30:37.000000000","message":"Uploaded patch set 1.","accounts_in_message":[],"_revision_number":1},{"id":"c4a923b7eeedd4d3a10ef56ee213f7bc87a087c5","author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"date":"2019-11-07 16:31:13.000000000","message":"Uploaded patch set 2: Commit message was updated.","accounts_in_message":[],"_revision_number":2},{"id":"8b4c68fdd1d103ca2354bd695be787207d180949","author":{"_account_id":10607,"name":"Alexandra Settle","email":"a.settle@outlook.com","username":"asettle"},"date":"2019-11-07 16:35:00.000000000","message":"Patch Set 2: Code-Review+2\n\nGood example! Thanks","accounts_in_message":[],"_revision_number":2},{"id":"86d1ff1e064fdd4899c8ad16bc769b436748795c","tag":"autogenerated:zuul:check","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-11-07 16:37:58.000000000","message":"Patch Set 2: Verified+1\n\nBuild succeeded (check pipeline).\n\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/a87cb638781f42948906029ae35d67db : SUCCESS in 5m 25s","accounts_in_message":[],"_revision_number":2},{"id":"700b127d323ce57a524199d2a18e74dc1b453e91","author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"date":"2019-11-07 22:09:40.000000000","message":"Patch Set 2: Code-Review+1\n\nLGTM","accounts_in_message":[],"_revision_number":2},{"id":"618ff9c96a52ce725e1ebd4a78ba474ec9408e05","author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"date":"2019-11-11 14:32:28.000000000","message":"Patch Set 2: Code-Review+1\n\nI just wanted to add something similar to this page to make the \u0027conflicts lines\u0027 explanation more clear. Now with the example and a separate section it should be super-clear! Thanks!","accounts_in_message":[],"_revision_number":2},{"id":"f8d4e0e7b77ec048c824b713ce1bdf76ea5839a0","author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"date":"2019-11-11 14:36:58.000000000","message":"Patch Set 2:\n\n(1 comment)","accounts_in_message":[],"_revision_number":2},{"id":"35bbbb70f3d910e89083870c42d035cd76561bc9","author":{"_account_id":28543,"name":"shupeng","email":"15050873171@163.com","username":"Vieri"},"date":"2019-11-11 14:53:39.000000000","message":"Patch Set 2: Code-Review+1","accounts_in_message":[],"_revision_number":2},{"id":"7a4e3844ac8785cb60f8b4859ddb83cc663fb00e","author":{"_account_id":308,"name":"Thierry Carrez","email":"thierry@openstack.org","username":"ttx"},"date":"2019-11-12 09:46:46.000000000","message":"Patch Set 2: Code-Review+2 Workflow+1\n\nLGTM - further improvements can be proposed in subsequent patches.","accounts_in_message":[],"_revision_number":2},{"id":"8d46761eac1ac46b6aee91f2b238371ca69efab1","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-11-12 09:46:57.000000000","message":"Patch Set 2: -Verified\n\nStarting gate jobs.","accounts_in_message":[],"_revision_number":2},{"id":"ee5e3c14b8580c7efed6f2cf709fe193bb4cb6d7","tag":"autogenerated:zuul:gate","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-11-12 09:50:51.000000000","message":"Patch Set 2: Verified+2\n\nBuild succeeded (gate pipeline).\n\n- openstack-tox-docs https://zuul.opendev.org/t/openstack/build/2d3f6903c598401c9264058729aeeb30 : SUCCESS in 3m 15s","accounts_in_message":[],"_revision_number":2},{"id":"193ff6345a8ddad2df6d02449f18479ba2a94a3d","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-11-12 09:50:52.000000000","message":"Change has been successfully merged by Zuul","accounts_in_message":[],"_revision_number":2},{"id":"3ed19f6eda847561cb49e7334af08a17f89af9e6","tag":"autogenerated:zuul:promote","author":{"_account_id":22348,"name":"Zuul","username":"zuul","tags":["SERVICE_USER"]},"date":"2019-11-12 09:51:59.000000000","message":"Patch Set 2:\n\nBuild succeeded (promote pipeline).\n\n- promote-openstack-tox-docs-direct https://zuul.opendev.org/t/openstack/build/f0d23d94e9bd4de6bdefe36913047a94 : SUCCESS in 51s","accounts_in_message":[],"_revision_number":2},{"id":"c36a3ac574af5db3a4347d5e1fbd28e82fd29735","author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"date":"2019-11-12 12:54:11.000000000","message":"Patch Set 2:\n\n\u003e LGTM - further improvements can be proposed in subsequent patches.\n\nI\u0027ve added a Note for the new section: https://review.opendev.org/#/c/693829","accounts_in_message":[],"_revision_number":2}],"current_revision_number":2,"current_revision":"0e80c32f56a013b99fa9118a90277295e9fa2e23","revisions":{"96089add8095afa76d866c6b3f5d2990c4d43cd0":{"kind":"REWORK","_number":1,"created":"2019-11-07 16:30:37.000000000","uploader":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"ref":"refs/changes/84/693384/1","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/project-team-guide","ref":"refs/changes/84/693384/1","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/1 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/1 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/1 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/1"}}},"commit":{"parents":[{"commit":"fc75b0a74796f2f6ac4f253160b9975d4690b79b","subject":"Merge \"Allow multiple releases in cycle-automatic\"","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/project-team-guide/commit/fc75b0a74796f2f6ac4f253160b9975d4690b79b"}]}],"author":{"name":"Matt Riedemann","email":"mriedem.os@gmail.com","date":"2019-11-07 16:29:37.000000000","tz":-300},"committer":{"name":"Matt Riedemann","email":"mriedem.os@gmail.com","date":"2019-11-07 16:29:37.000000000","tz":-300},"subject":"Give an example of dealing with backport conflicts","message":"Give an example of dealing with backport conflicts\n\nThe stable maint guide says to keep conflicts in the commit\nmessage in a backport which is good but I frequently have to\ngive people an example of what that should look like.\n\nThis moves the conflicts part to it\u0027s own sub-section for easy\nlinking and also links in an example of how to document\nconflicts in a backport.\n\nChange-Id: I550024dce50d19ac3dbbb6619159fafd8df8c314\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/project-team-guide/commit/96089add8095afa76d866c6b3f5d2990c4d43cd0"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/project-team-guide/commit/96089add8095afa76d866c6b3f5d2990c4d43cd0"}]},"branch":"refs/heads/master"},"0e80c32f56a013b99fa9118a90277295e9fa2e23":{"kind":"NO_CODE_CHANGE","_number":2,"created":"2019-11-07 16:31:13.000000000","uploader":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"ref":"refs/changes/84/693384/2","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/project-team-guide","ref":"refs/changes/84/693384/2","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/2 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/2 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/2 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/project-team-guide refs/changes/84/693384/2"}}},"commit":{"parents":[{"commit":"fc75b0a74796f2f6ac4f253160b9975d4690b79b","subject":"Merge \"Allow multiple releases in cycle-automatic\"","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/project-team-guide/commit/fc75b0a74796f2f6ac4f253160b9975d4690b79b"}]}],"author":{"name":"Matt Riedemann","email":"mriedem.os@gmail.com","date":"2019-11-07 16:29:37.000000000","tz":-300},"committer":{"name":"Matt Riedemann","email":"mriedem.os@gmail.com","date":"2019-11-07 16:31:03.000000000","tz":-300},"subject":"Give an example of dealing with backport conflicts","message":"Give an example of dealing with backport conflicts\n\nThe stable maint guide says to keep conflicts in the commit\nmessage in a backport which is good but I frequently have to\ngive people an example of what that should look like.\n\nThis moves the conflicts part to its own sub-section for easy\nlinking and also links in an example of how to document\nconflicts in a backport.\n\nChange-Id: I550024dce50d19ac3dbbb6619159fafd8df8c314\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/project-team-guide/commit/0e80c32f56a013b99fa9118a90277295e9fa2e23"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/project-team-guide/commit/0e80c32f56a013b99fa9118a90277295e9fa2e23"}]},"branch":"refs/heads/master"}},"requirements":[],"submit_records":[],"submit_requirements":[]}