I have Beyond Compare configured as my Git merge tool. When I merge a branch that has conflicting image files (PNG files, in my case), BC displays the two images side-by-side, and the title says "Picture Compare". The screen I see looks like this:

In my case, I would like to tell Git to keep the REMOTE file rather than the LOCAL file. How can I do this in Beyond Compare? I clicked around, didn't see anything helpful, and eventually exited BC. My Git merge then said:
merge of .../ic_launcher_foreground.png failed
Continue merging other unresolved paths [y/n]? y
I'm sure I can resolve this via the command line in Git, but I'd like to use BC to view the images and select which one to keep, if possible. Thanks for any suggestions!
In my case, I would like to tell Git to keep the REMOTE file rather than the LOCAL file. How can I do this in Beyond Compare? I clicked around, didn't see anything helpful, and eventually exited BC. My Git merge then said:
merge of .../ic_launcher_foreground.png failed
Continue merging other unresolved paths [y/n]? y
I'm sure I can resolve this via the command line in Git, but I'd like to use BC to view the images and select which one to keep, if possible. Thanks for any suggestions!
Comment