On Tue, Jan 6, 2009 at 11:37 PM, <chrisg_at_warpspeed.com.au> wrote:
> How do you manage a merge failure of a binary file?
> When you select edit conflicts it comes up with only an error dialog with a big red X in and - not even any text associated with it.
> I end up with:
> I expect the merge to fail, as it can not (nor do I expect it to) manage the merging of binary files.
> I can work out which one I want, but I've yet to work out how to get subclipse to allow me to manage the process. How/what do I select to resolve the differences?
> The only means that I've worked out so far is deleting and renaming as appropriate - which is not pleasant!
Items that have conflicts show up in the Eclipse Problems view as an
SVN conflict. There is a quick fix option attached to that which has
support for Choose Mine/Choose Theirs.
If you install the CollabNet Desktop and use the merge client it
provides to Subclipse it also provides interactive resolutions for
binary files during the merge that would let you pick a version.
You could also file an issue to have the Subclipse "Mark Resolved"
option enhanced to bring up a dialog that lets you choose the
resolution you want. Currently, it assumes that the file itself is as
you want it so if you do not use the other options I mention, then you
would need to delete/rename files before using it.
Received on 2009-01-07 15:42:24 CET