From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Wed, 15 Dec 2010 08:33:01 GMT
Subject: Re: When I merge, a binary file conflict,how can I select between 2 versions?
Message-ID: <20101215083301.GA6946@LK-Perkele-V2.elisa-laajakaista.fi>
In-Reply-To: <loom.20101215T084919-573@post.gmane.org>

On Wed, Dec 15, 2010 at 08:00:08AM +0000, Chunlin Zhang wrote:
> The only way now I know is to replace the file with the version file I want in
> working copy,and then git add and git commit.I think it is inconvenient.
> 
> Then I think if there is some command to select local or remote version file to
> add more easier,because it is obviously git keep 2 version file.
 
IIRC,

git checkout --theirs -- <file>
git add <file>


-Ilari