multiple branches not honored after conflict resolution #50
Description
$ python -m cherry_picker e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5 3.10 3.9
Now backporting 'e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5' into '3.10'
Switched to a new branch 'backport-e6d1aa1-3.10'
Branch 'backport-e6d1aa1-3.10' set up to track remote branch '3.10' from 'upstream'.
Error cherry-pick e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5.
Auto-merging Lib/test/test_contextlib_async.py
CONFLICT (content): Merge conflict in Lib/test/test_contextlib_async.py
...
[resolve conflict]
$ python -m cherry_picker --continue
🐍 🍒 ⛏
remote:
remote: Create a pull request for 'backport-e6d1aa1-3.10' on GitHub by visiting:
remote: https://github.com/belm0/cpython/pull/new/backport-e6d1aa1-3.10
remote:
To github.com:belm0/cpython.git
* [new branch] backport-e6d1aa1-3.10 -> backport-e6d1aa1-3.10
Backport PR URL:
https://github.com/python/cpython/compare/3.10...belm0:backport-e6d1aa1-3.10?expand=1
Switched to branch 'main'
Deleted branch backport-e6d1aa1-3.10 (was 91814316ed).
branch backport-e6d1aa1-3.10 has been deleted.
(cherry_picker exited with success, but backport to branch 3.9 was not processed)