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

Re: [Subclipse-users] conflict resolution during a merge

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-06-22 20:11:30 CEST

Bradley Wagner <bradley.wagner@hannonhill.com> wrote on 06/22/2006
02:00:16 PM:

> That is correct. That is what I'm seeing. So what you're saying is
> that in order to get the conflicts to appear for resolving I need to
> do a Compare With Base Revision for the whole project instead of just
> a Team->Synch

No, not at all. The Compare with Base Revision was something I suggested
to the original poster as a way to see what the merge did. Files with
conflicts will show up with a conflict decorator, which is a light colored
diamond shaped thingy, and they also have problem markers attached so
should show in the Problems view. Sometimes you have to look at the
filters and be sure the SVN Conflicts marker is enabled. As I also
mentioned previously, the Problem markers have Quick Fix actions
associated with them, but you can also just use Team -> Edit Conflicts and
Team -> Mark Resolved.

See:
http://svn.collab.net/subclipse/help/topic/org.tigris.subversion.subclipse.doc/html/reference/mark-resolved.html
http://svn.collab.net/subclipse/help/topic/org.tigris.subversion.subclipse.doc/html/reference/edit-conflicts.html

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Jun 22 20:11:46 2006

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