[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[Subclipse-users] Merging Binary files with Subclipse: How to?

From: <chrisg_at_warpspeed.com.au>
Date: Tue, 6 Jan 2009 20:37:17 -0800 (PST)

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:
binary.file
binary.file.merge-left.rXXX
binary.file.merge-right.rXXX

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!

-Chris

subclipse: 1.4.5.

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1009245

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-01-07 14:29:54 CET

This is an archived mail posted to the Subclipse Users mailing list.