-
-
Notifications
You must be signed in to change notification settings - Fork 86
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
restack
appears to enter infinite loop when it encounters a merge conflict
#33
Comments
Thanks for the detailed report and repro steps. I wasn't able to to reproduce this, with this slightly modified script (
Most likely this was fixed in 15fe104, released in https://github.com/arxanas/git-branchless/releases/tag/v0.3.2. I would ask what version of
|
Oops, I forgot that Issue is gone after upgrading. |
When I amend to an older commit in the stack that results in a merge conflict, I get repeated errors indicating a rebase is in progress:
The last bit repeats endlessly.
Repro:
If you run into this in the wild:
git add README.md
git rebase --continue
git restack
The text was updated successfully, but these errors were encountered: