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

On Dec 11, 2007 8:51 AM, Johan Compagner <jcompagner@gmail.com> wrote:
> But then if this would work can i then say, i want the remove edition,
> overwrite my local one?
>
> Merging is a bit difficult with subclipse, now our big project is gone from
> cvs to svn i really do miss the merging
> of cvs in the synchronize view of eclispe.
> I constantly had a pinned synchronization of HEAD -> BRANCH (with common
> base) and that you could sync now and then
> and the changes that where made since the last sync can then be previewed
> and then applied or manually merged.
>
> In SVN it seems that you have to merge first revision by revision (i can't
> say do 10 -> 15 at once somehow)
> that works directly on files so i get compile errors or merge conflicts
> everywhere.
>
> But then the merge conflicts i don't see those in a synchronize view so i
> have to mannually search for the files and say Edit Conflicts
> It would be nice that all the conflicts where marked as conflicts in a
> synchonize view somehow and that you can then walk over
> them with also an option keep mine, keep remote (especially with binaries)

If you want an idea where things are headed with merge take a look at this:

http://merge-tracking.open.collab.net/

-- 
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