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.
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.