Resolving merge conflicts on binary files
Created originally on Bitbucket by PaulEichhorn (Paul Eichhorn)
When a merge conflict occurs on a binary file, the file stays in the unmodified state.
I can not bring in the changes via the Merge Editor, and I did not find a popup option to "Resolve using theirs".
Trying "Replace with ..." warns me that there is a merge in progress, and offers me to cancel or abort the merge.
Is there an option that I have missed?