Re: [Subclipse-users] how to merge binaries? (and when to get a synchronized view merge?)

On Dec 11, 2007 12:06 PM, Johan Compagner <jcompagner@gmail.com> wrote:
> that looks to go into the right direction!
> What is the release schedule of 1.5 (and the eclipse plugins?)

Subclipse 1.4.0 will be released concurrent with SVN 1.5. The
schedule for 1.5 is still an unknown. The GA would be a minimum of 12
more weeks though.

> But still that doesn't solve my problem of merging binaries that are
> conflicting

I did not understand your issue. In the next release of Subclipse we
do allow you to specify a custom conflict resolution by file type.
Your example was a JAR. It would be impossible to merge a JAR. But
for other binary types if you have a program that can resolve
conflicts you can use it.

> also the quick fix that are in the problems view where i can say use mine,
> use remote
> doesn't seem to help, even if i say use remote then i get mine (not changed
> file)

Yes, these only work correctly when the conflicts were created by
Update. This is fixed in next release.

> By the way a merging conflict should be an error not a warning.. Because
> that is something that really must be resolved..

I believe we chose warning so that the icon would stand out. The
files will have errors anyway because of the conflict markers and it
let the extra decorator show up better. Subversion is not going to
allow the commit to happen regardless. Plus the merge client I
pointed to handles this differently anyway (although the markers will
still be there).

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org