* When I merge, a binary file conflict,how can I select between 2 versions?
@ 2010-12-15 8:00 Chunlin Zhang
2010-12-15 8:33 ` Ilari Liusvaara
0 siblings, 1 reply; 3+ messages in thread
From: Chunlin Zhang @ 2010-12-15 8:00 UTC (permalink / raw)
To: git
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: When I merge, a binary file conflict,how can I select between 2 versions?
2010-12-15 8:00 When I merge, a binary file conflict,how can I select between 2 versions? Chunlin Zhang
@ 2010-12-15 8:33 ` Ilari Liusvaara
2010-12-15 9:01 ` Chunlin Zhang
0 siblings, 1 reply; 3+ messages in thread
From: Ilari Liusvaara @ 2010-12-15 8:33 UTC (permalink / raw)
To: Chunlin Zhang; +Cc: git
On Wed, Dec 15, 2010 at 08:00:08AM +0000, Chunlin Zhang wrote:
> 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.
>
> 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.
IIRC,
git checkout --theirs -- <file>
git add <file>
-Ilari
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: When I merge, a binary file conflict,how can I select between 2 versions?
2010-12-15 8:33 ` Ilari Liusvaara
@ 2010-12-15 9:01 ` Chunlin Zhang
0 siblings, 0 replies; 3+ messages in thread
From: Chunlin Zhang @ 2010-12-15 9:01 UTC (permalink / raw)
To: git
Ilari Liusvaara <ilari.liusvaara <at> elisanet.fi> writes:
> git checkout --theirs -- <file>
> git add <file>
Thanks you very much.That is what I want!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-15 9:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-15 8:00 When I merge, a binary file conflict,how can I select between 2 versions? Chunlin Zhang
2010-12-15 8:33 ` Ilari Liusvaara
2010-12-15 9:01 ` Chunlin Zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).