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

'Theirs' merge between branches on a binary file.

From
Tim Visher <tim.visher@gmail.com>
Date
Dec 22, 2008, 20:56 UTC
Message-ID
<c115fd3c0812221256l494bb824ga8e1640efb07b20c@mail.gmail.com>
Hello Everyone,

I have a binary file that is coming up with a merge conflict (obviously) between two branches and I want to simply say, 'take their version of the file'. Is this possible? In subversion it's a pretty trivial merge operation, so I assume there's something similar in git.

Thanks in advance!
-- 
In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail
Next: Junio C Hamano
Message 1 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.