search

keith / git-pile

Stacked diff support for GitHub workflows
MIT License
146 stars 11 forks source link

Abort rebase if continue fails #29

Closed keith closed 1 year ago

keith commented 1 year ago

If mergetool succeeds but somehow the conflicting files are still marked as unresolved, it leaves the checkout in a bad state. Now it at least aborts the rebase. I don't know how it's possible to have a successful mergetool with unresolved conflicts but I haven't investigated. The 1 log I have seen shows the conflicts were resolved with rerere, but then the continue still failed.

keith commented 1 year ago

not sure if we should merge this or try to understand the underlying issue