{"thread":{"id":"26073","subject":"When I merge, a binary file conflict,how can I select between 2 versions?","startedAt":"2010-12-15T08:00:08Z","lastAt":"2010-12-15T09:01:18Z","messageCount":3,"participants":["Chunlin Zhang","Ilari Liusvaara"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"158143","messageId":"loom.20101215T084919-573@post.gmane.org","threadId":"26073","inReplyTo":null,"subject":"When I merge, a binary file conflict,how can I select between 2 versions?","fromName":"Chunlin Zhang","fromEmail":"zhangchunlin@gmail.com","sentAt":"2010-12-15T08:00:08Z","receivedAt":"2010-12-15T08:00:08Z","isPatch":false,"sender":{"key":"zhangchunlin@gmail.com","avatar":"https://gravatar.com/avatar/3767134496b3344f758bafc6cf8b5be08e212193fcaaff9dc819b732b5a0c476?d=mp&s=160"},"body":"The only way now I know is to replace the file with the version file I want in\nworking copy,and then git add and git commit.I think it is inconvenient.\n\nWhen I use \"git mergetool\",it output:\n'''\nMerging the files: binary_example.png\n\nNormal merge conflict for 'binary_example.png':\n  {local}: modified\n  {remote}: modified\nHit return to start merge resolution tool (meld): \n'''\n\nThen I think if there is some command to select local or remote version file to\nadd more easier,because it is obviously git keep 2 version file.\n\nDoes anyone know it?\n\nThanks!\n"},{"id":"158146","messageId":"20101215083301.GA6946@LK-Perkele-V2.elisa-laajakaista.fi","threadId":"26073","inReplyTo":"loom.20101215T084919-573@post.gmane.org","subject":"Re: When I merge, a binary file conflict,how can I select between 2 versions?","fromName":"Ilari Liusvaara","fromEmail":"ilari.liusvaara@elisanet.fi","sentAt":"2010-12-15T08:33:01Z","receivedAt":"2010-12-15T08:33:01Z","isPatch":false,"sender":{"key":"ilari.liusvaara@elisanet.fi","avatar":null},"body":"On Wed, Dec 15, 2010 at 08:00:08AM +0000, Chunlin Zhang wrote:\n> The only way now I know is to replace the file with the version file I want in\n> working copy,and then git add and git commit.I think it is inconvenient.\n> \n> Then I think if there is some command to select local or remote version file to\n> add more easier,because it is obviously git keep 2 version file.\n \nIIRC,\n\ngit checkout --theirs -- <file>\ngit add <file>\n\n\n-Ilari\n"},{"id":"158147","messageId":"loom.20101215T095901-345@post.gmane.org","threadId":"26073","inReplyTo":"20101215083301.GA6946@LK-Perkele-V2.elisa-laajakaista.fi","subject":"Re: When I merge, a binary file conflict,how can I select between 2 versions?","fromName":"Chunlin Zhang","fromEmail":"zhangchunlin@gmail.com","sentAt":"2010-12-15T09:01:18Z","receivedAt":"2010-12-15T09:01:18Z","isPatch":false,"sender":{"key":"zhangchunlin@gmail.com","avatar":"https://gravatar.com/avatar/3767134496b3344f758bafc6cf8b5be08e212193fcaaff9dc819b732b5a0c476?d=mp&s=160"},"body":"Ilari Liusvaara <ilari.liusvaara <at> elisanet.fi> writes:\n\n> git checkout --theirs -- <file>\n> git add <file>\nThanks you very much.That is what I want!\n"}]}