-
-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix exit with bad state when backport branch already exists #39
Conversation
Your change is still worth integrating but note that when a backport branch already exists, now cherry-picker will force-push to it (with --force-with-lease so only if there are no other changes on that remote branch): |
Does that mean I should change this to overwrite the existing local branch or should I leave it as it is right now? I went for the more cautious way but I don't really mind changing it if you think it would be better the other way. |
I resolved the conflict caused by #56. Since I'm already commenting, I just want to gently remind you that I haven't received a response to my question here. I realize it's probably a terrible time for a reminder since it's Christmas, it just so happened that I found about these conflicts while working on something else today 😄 Happy holidays! |
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Thanks for the work. |
Introduced in python#39
Fixes #38
I also went ahead and added a
branch_name
attribute toBranchCheckoutException
which should allow miss-islington (or others using the API) to remove the problematic branch automatically (see python/miss-islington#480). I don't think it would be wise for cherry-picker to do it for you since that potentially risks you losing some work.