Re: [egit-dev] resolving merge conflicts

[Robin Stocker <robin@xxxxxxxxx>]

Markus Duft wrote:
> Hey!
> 
> Am I just too stupid or is there a problem...:
> 
> i'm merging/rebasing and have a conflict in a binary file. now i want
> to choose which version (ours/theirs) i want to keep. how can i do it?
> i though of "Replace with > Version from <whatever>" but all those
> options are completely disabled when stuck in a rebase (at least).
> ideas?

There's an open bug report about adding "Replace With -> Ours/Theirs":

https://bugs.eclipse.org/bugs/show_bug.cgi?id=347835

It's currently stuck because of lack of knowledge of how to dynamically
show/hide the menu items in the "Replace With" menu (help wanted).

Regards,
  Robin Stocker