Never-ending merging status

Open capehill opened this issue 6 years ago • 1 comments

Sometimes, when fetching changes from remote (sgit fetch origin) and merging them (sgit merge origin/master), repository stays in "merging" state (without conflicts). Any idea how to clear this without re-cloning?

This is slightly annoying because it seems to affect commit history, making it non-linear.

Aug 11 '19 10:08 capehill

There is a workaround, removing one of the "MERGE" files inside .git clears this. I don't remember the exact file name.

Sep 21 '19 07:09 capehill