From: Junio C Hamano <junkio@cox.net>
Date: Wed, 22 Nov 2006 11:57:07 GMT
Subject: Re: Struggling with tangled
Message-ID: <7vu00rsnho.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0611221233370.30004@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi,
>
> On Wed, 22 Nov 2006, Alan Chandler wrote:
>
>> 2) Some files get completely munged with conflict resolution markers 
>> every few lines.  Is there a simple way to say "don't use this file, but 
>> use the [stage2/stage3] sources of the merge". (ie one of the original 
>> inputs to the merge - and if so, which one is which)
>
> I find myself using
>
> 	git diff --ours <file>
>
> and
>
> 	git diff --theirs <file>
>
> in such a case sometimes. If I _know_ my version is good, I do
>
> 	git diff --ours <file> | git apply -R
>
> This also updates the index.

Good suggestion, but apply does not update the index without
being told to do so with --index, so I think the commandline
should be:

	git diff --ours <path> | git apply -R --index