Re: how to ignore merge conflicts?

From: Linus Torvalds <torvalds@osdl.org>
Date: Oct 30, 2006, 20:29 UTC
Message-ID: <Pine.LNX.4.64.0610301223021.25218@g5.osdl.org>
In-Reply-To: <200610301448.38222.len.brown@intel.com>

On Mon, 30 Oct 2006, Len Brown wrote:

Show 8 quoted lines

>
> Sometimes when a multiple-file merge give conflicts, I don't want to edit
> one of the resulting <<<<<=====>>>>> files.
> Instead, I just want to choose the version of that particular file that
> existed in one of the two merged branches and commit that along with
> the rest of the merge.
> 
> How to do this?

Well, if you promise not to do what has happened several times before in people who maintained their own CVS trees, for example (which is to just ignore all merge problems, and force _their_ version, even though the reason for the merge problem was that somebody else had fixed a bug, that was now unfixed by the "merge"), here's the trivial way to do it:

	git checkout HEAD the/file/you/wanted.c

(or, if you want to take it from the source you are merging _from_, just use MERGE_HEAD instead of HEAD).

And you're done.