Re: "Temporary merge branch 2" Conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 17, 2012, 21:10 UTC
Message-ID: <7vfw7lteaw.fsf@alter.siamese.dyndns.org>
In-Reply-To: <732986549.167685.1345236990359.JavaMail.root@genarts.com>

Stephen Bash <bash@genarts.com> writes:

> What is the recommended method for resolving this sort of merge?
> kdiff3 obviously doesn't understand the situation.  Do the working
> tree files contain all the conflicts?  If so, I can just go
> through by hand and resolve the conflicts the old fashion way.

Yes. External tools like kdiff3 may not understand the conflict in the working tree, but the files in the working tree should have resolved the naturally resolvable bits and only left the conflicted bits conflicted. Just resolve manually if you can, and then look at what both branches wanted to do to the file ("git log -p --merge $that_path" before you "git add" as the final sanity check would work nicely) to make sure your resolution makes sense.