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

Re: When I merge, a binary file conflict,how can I select between 2 versions?

From
Chunlin Zhang <zhangchunlin@gmail.com>
Date
Dec 15, 2010, 09:01 UTC
Message-ID
<loom.20101215T095901-345@post.gmane.org>
In-Reply-To
<20101215083301.GA6946@LK-Perkele-V2.elisa-laajakaista.fi>
Ilari Liusvaara <ilari.liusvaara <at> elisanet.fi> writes:
> git checkout --theirs -- <file>
> git add <file>
Thanks you very much.That is what I want!
Previous: Ilari Liusvaara
Message 3 of 3 in “When I merge, a binary file conflict,how can I select between 2 versions?”
  1. Chunlin ZhangDec 15, 2010
  2. Ilari LiusvaaraDec 15, 2010
  3. Chunlin ZhangDec 15, 2010

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.