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

Re: [Subclipse-users] Merging conflicts one way only

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-06-22 15:15:20 CEST

On 6/22/07, Kiren Pillay <kiren@setaskill.co.za> wrote:
>
> I am trying to resolve a conflict, and the diff window only allows me to copy
> changes from the repository's version to my side (ie. incoming only).
>
> In tortoiseSVN I can copy changes in either direction.
>
> Is this a bug?

No, it is just a difference in how the conflict editor works. The
editor comes from Eclipse in this case by the way, not Subclipse. I
believe the changes going the other way are already in the file, so
you do not need to do anything. Of course, both Tortoise and Eclipse
work the same in that there is only one file being updated. When
Tortoise finds a conflict, it lets you pick which version you want.
When Eclipse finds a conflict, "your" version is already picked and
you can replace it with the other version. The Eclipse editor is also
an "editor" so you can also type and fix code during this process.

Finally, the Subclipse preferences allow you to use TortoiseMerge, or
any other external tool to do this.

-- 
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
Received on Fri Jun 22 15:15:08 2007

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