From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Wed, 15 Dec 2010 09:01:18 GMT
Subject: Re: When I merge, a binary file conflict,how can I select between 2 versions?
Message-ID: <loom.20101215T095901-345@post.gmane.org>
In-Reply-To: <20101215083301.GA6946@LK-Perkele-V2.elisa-laajakaista.fi>

Ilari Liusvaara <ilari.liusvaara <at> elisanet.fi> writes:

> git checkout --theirs -- <file>
> git add <file>
Thanks you very much.That is what I want!