Resolving conflicting image files during a Git merge

[dkurth]

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!

[Aaron]

Unfortunately not. BC4's Text Merge (or a parent Folder Merge that was manually launched) are the only sessions that support merge output commands. When passing in (assumingly) 3 parameters of picture files, BC4 launches the Picture Compare with only the first 2 (the third would have been the common Ancestor). This diff view has no merge controls and can't update the merge process.

You can review the diff, but would need to back out and re-attempt any binary files with the internal git commands after resolving any of the text merges.

[dkurth]

Okay, thanks for letting me know!