From: "Tim Visher" <tim.visher@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: 'Theirs' merge between branches on a binary file.
Date: Mon, 22 Dec 2008 17:58:39 -0500 [thread overview]
Message-ID: <c115fd3c0812221458q3444cbcai7ab1716b9195ad08@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2008-12-22 23:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-22 20:56 'Theirs' merge between branches on a binary file Tim Visher
2008-12-22 21:11 ` Junio C Hamano
2008-12-22 21:16 ` Tim Visher
2008-12-22 22:52 ` Junio C Hamano
2008-12-22 22:58 ` Tim Visher [this message]
2008-12-22 23:18 ` Junio C Hamano
2008-12-23 14:05 ` Tim Visher
2008-12-23 18:31 ` René Scharfe
2008-12-28 17:14 ` Tim Visher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c115fd3c0812221458q3444cbcai7ab1716b9195ad08@mail.gmail.com \
--to=tim.visher@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).