From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2008 22:52:59 GMT
Subject: Re: 'Theirs' merge between branches on a binary file.
Message-ID: <7vd4fjhlf8.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <c115fd3c0812221316y24ce0c7q29807cd349a99e83@mail.gmail.com>

"Tim Visher" <tim.visher@gmail.com> writes:

> On Mon, Dec 22, 2008 at 4:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
>> Do you mean during a conflicted merge resolution you would want to check
>> their version out of the index and declare that it is the merge result?
>
> Sure.

That sounds like "git checkout --theirs"...