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

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

From
Chunlin Zhang <zhangchunlin@gmail.com>
Date
Dec 15, 2010, 08:00 UTC
Message-ID
<loom.20101215T084919-573@post.gmane.org>

The only way now I know is to replace the file with the version file I want in working copy,and then git add and git commit.I think it is inconvenient.

When I use "git mergetool",it output: ''' Merging the files: binary_example.png

Normal merge conflict for 'binary_example.png':
  {local}: modified
  {remote}: modified
Hit return to start merge resolution tool (meld): 
'''

Then I think if there is some command to select local or remote version file to add more easier,because it is obviously git keep 2 version file.

Does anyone know it?
Thanks!
Next: Ilari Liusvaara
Message 1 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.