From: Tim Visher <tim.visher@gmail.com>
Date: Mon, 22 Dec 2008 22:58:39 GMT
Subject: Re: 'Theirs' merge between branches on a binary file.
Message-ID: <c115fd3c0812221458q3444cbcai7ab1716b9195ad08@mail.gmail.com>
In-Reply-To: <7vd4fjhlf8.fsf@gitster.siamese.dyndns.org>

On Mon, Dec 22, 2008 at 5:52 PM, Junio C Hamano <gitster@pobox.com> wrote:

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

I'm sorry, Junio.  I don't mean to be dense but I can't find that in
the docs and when I execute it it comes back as an unknown command.
Perhaps you could just point me to the relevant man page?  This seems
like such a fundamental operation, I just don't understand why there
isn't something like a `git resolve`.

Thanks for your help!

-- 

In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail