Repository navigation
abort doesn't undo reset #198
Description
Activity
Copy-pasting @joyeecheung 's comment from nodejs/node#18914 (comment):
@joyeecheung bradley mentioned ncu, was node land final for single commits ever fixed? it could be related
I could not reproduce that so no sure how to get it fixed though....
@bmeck Did you run git node land --abort on your PR branch? That would reset your PR branch to upstream/master (but it will prompt you first before doing the reset). I guess if you push the upstream/master head to this branch, then github might auto close it since there is nothing to merge - but I am pretty sure you'll have to force-push to this branch to make that happen. Have you force pushed?
I guess we could warn/prompt before allowing the running of commands like
git node land --aborton a branch that isn'tmasterorv[0-9].x*.- added a commit that references this issue
on Mar 5, 2018 - added a commit that references this issue
on Nov 2, 2022 - added a commit that references this issue
on Nov 10, 2022 - added a commit that references this issue
on Jan 27, 2023 - added a commit that references this issue
on Jan 27, 2023 - added a commit that references this issue
on Sep 14, 2023
When you run
git node land --abortit resets the branch but then does not undo that once it aborts. This can lead to some confusion since it leaves the branch without the commits it included previously. So this can lead to odd looking behavior when you sync your branch back up to github and/or detached HEAD. See nodejs/node#18914 (comment) for example of confusion caused by this.