copybot: Add STOP merge conflict behavior
Add STOP merge conflict behavior to stop at the conflicted CL and upload
any staged commits before it.
BUG=b:334241374
TEST=Create branch testZephyr, cause conflict, then:./copybot.py --topic zephyr-downstream --label Verified+1 --re cros.copybot.ota@gmail.com --merge-conflict-behavior STOP --keep-pseudoheader Cq-Depend --push-option 'uploadvalidator~skip' --push-option nokeycheck --upstream-history-limit 250 --downstream-history-limit 1000 https://github.com/zephyrproject-rtos/zephyr:main: ~/chromiumos/src/third_party/zephyr/main:testZephyr: --dry-run
Change-Id: I6982abfa749c7cd5d42d60b0feaff1fe7128bb15
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/5450832
Tested-by: Jonathon Murphy <jpmurphy@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Auto-Submit: Jonathon Murphy <jpmurphy@google.com>
1 file changed