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

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

> I have a binary file that is coming up with a merge conflict
> (obviously) between two branches and I want to simply say, 'take their
> version of the file'.

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?