You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
$ cherry_picker dbbe4d2d0075fa0e95b069fb4780d79aae3514c7 3.9
π π β
Now backporting 'dbbe4d2d0075fa0e95b069fb4780d79aae3514c7' into '3.9'
Error cherry-pick dbbe4d2d0075fa0e95b069fb4780d79aae3514c7.
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git cherry-pick --skip'
On branch backport-dbbe4d2-3.9
Your branch is up to date with 'upstream/3.9'.
You are currently cherry-picking commit dbbe4d2d00.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Untracked files:
(use "git add <file>..." to include in what will be committed)
1.diff
bpo-42218.py
test.c
test.err
test.out
test.tests
test2.c
test_multiprocessing_fork.tests
test_multiprocessing_fork2.tests
nothing added to commit but untracked files present (use "git add" to track)
Failed to cherry-pick dbbe4d2d0075fa0e95b069fb4780d79aae3514c7 into 3.9 βΉ
... Stopping here.
To continue and resolve the conflict:
$ cherry_picker --status # to find out which files need attention
# Fix the conflict
$ cherry_picker --status # should now say 'all conflict fixed'
$ cherry_picker --continue
To abort the cherry-pick and cleanup:
$ cherry_picker --abort
I have just upgraded cherry_picker from a very old version, so it may be related. I still did not try to use cherry_picker with other PRs.
The text was updated successfully, but these errors were encountered:
$ cherry_picker --status
π π β
On branch backport-dbbe4d2-3.9
Your branch is up to date with 'upstream/3.9'.
You are currently cherry-picking commit dbbe4d2d00.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Untracked files:
(use "git add <file>..." to include in what will be committed)
1.diff
bpo-42218.py
test.c
test.err
test.out
test.tests
test2.c
test_multiprocessing_fork.tests
test_multiprocessing_fork2.tests
nothing added to commit but untracked files present (use "git add" to track)
I get the following error when tried to backport python/cpython#31938.
I have just upgraded
cherry_picker
from a very old version, so it may be related. I still did not try to usecherry_picker
with other PRs.The text was updated successfully, but these errors were encountered: