-
Notifications
You must be signed in to change notification settings - Fork 125
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
Stuck in a merge, imerge crashes when attempting to continue #199
Comments
In case it might be useful, this is the output of
|
I suspect that the
However, even changing it and trying to continue the merge results in the crash happening again and the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Hi,
git-imerge
crashes when attempting to continue an incremental merge. The crash looks as follows:git status
after the crash (very long, sorry for the external link): https://paste.sr.ht/blob/b466f3ca90050fbd8e2cf23cf7af716096c1ce46Is it possible to recover from this situation? I've been working on this merge for a few days now, my current priority is not to lose the work I've done so far.
The text was updated successfully, but these errors were encountered: