Re: 'Theirs' merge between branches on a binary file.

From: Tim Visher <tim.visher@gmail.com>
Date: Dec 23, 2008, 14:05 UTC
Message-ID: <c115fd3c0812230605x369af9c0n372db761fa11ce39@mail.gmail.com>
In-Reply-To: <7v3agfhk8b.fsf@gitster.siamese.dyndns.org>

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

> Hmph, I meant to point you at:
>
>    http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html

Ah, yes.  There it is. :)

Show 5 quoted lines

> I think you can use "git checkout-index --stage=3 path" if your git is
> older than that one with the option.
>
> v1.6.0.1-15-g38901a4 (checkout --ours/--theirs: allow checking out one
> side of a conflicting merge, 2008-08-30) introduced the feature.

Apparently this was added, at least to the docs, only in the latest release? That's kind of weird A) because the tag indicates 1.6.0.1, not 0.6, and B) It's a pretty trivial operation in other VCSes. Hmm... Maybe I'll try to updated the docs to make this feature a little more visible.

Anyway, the checkout-index command does indeed work in the older version. That's kind of what I was looking for. I'm now working on compiling git under cygwin as the latest version cygwin installs for you is 0.4!

Thanks for your help!

-- 
In Christ,

Timmy V.

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