git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Tim Visher <tim.visher@gmail.com>
Date
Dec 22, 2008, 22:58 UTC
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
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 9 in “'Theirs' merge between branches on a binary file.”
  1. Tim VisherDec 22, 2008
  2. Junio C HamanoDec 22, 2008
  3. Tim VisherDec 22, 2008
  4. Junio C HamanoDec 22, 2008
  5. Tim VisherDec 22, 2008
  6. Junio C HamanoDec 22, 2008
  7. Tim VisherDec 23, 2008
  8. René ScharfeDec 23, 2008
  9. Tim VisherDec 28, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.