From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Aug 2008 21:53:12 GMT
Subject: Re: [PATCH 2/2] checkout: allow ignoring unmerged paths when checking out of the index
Message-ID: <7vzlmv32uv.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <7v7i9z4hx2.fsf@gitster.siamese.dyndns.org>

There is an obvious sequel to this story.  We can enhance the behaviour of
checkout out of the index during a conflicted merge by doing the
following, which is the reason why I stumbled upon this bug that was fixed
by these two patches:

 * Teach "git checkout --ours", "git checkout ---theirs" so that stages 2
   and stages 3 for unmerged paths are checked out (and possibly resolve
   the conflict).

 * Teach "git checkout --merge" to redo the file level merge between
   stages 1/2/3, and update the work tree with the result.