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, 21:16 UTC
Message-ID
<c115fd3c0812221316y24ce0c7q29807cd349a99e83@mail.gmail.com>
In-Reply-To
<7vr63zhq4k.fsf@gitster.siamese.dyndns.org>
On Mon, Dec 22, 2008 at 4:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Do you mean during a conflicted merge resolution you would want to check
> their version out of the index and declare that it is the merge result?
Sure.  Let me try to be a bit clearer.

I was developing on a feature branch and now want to merge back into the master branch. Unfortunately, a binary file somewhat central to the development effort was changed between the the feature branch and the master branch and now there is a conflict. Obviously, I can't fix the conflict via markers or something like that because it's a binary file, and I know that I want the feature branch's version of the file, not the one that it is in conflict with. How would I just select the stage3 version of the file and add that to the index?

-- 
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 3 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.