From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 26 Jan 2007 09:07:34 +0000 (-0500)
Subject: git-gui: Don't allow users to commit a bad octopus merge.
X-Git-Tag: gitgui-0.6.0~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dff7e88febf85b1b8b1b789cd7c99434b70fb19b?hp=dff7e88febf85b1b8b1b789cd7c99434b70fb19b

git-gui: Don't allow users to commit a bad octopus merge.

If an octopus merge goes horribly wrong git-merge will leave the
working directory and index dirty, but will not leave behind a
MERGE_HEAD file for a later commit.  Consequently we won't know
its a merge commit and instead would let the user resolve the
conflicts and commit a single-parent commit, which is wrong.

So now if an octopus merge fails we notify the user that the
merge did not work, tell them we will reset the working directory,
and suggest that they merge one branch at a time.  This prevents
the user from committing a bad octopus merge.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---