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

[Subclipse-users] conflict resolution during a merge

From: Bradley Wagner <bradley.wagner_at_hannonhill.com>
Date: 2006-06-21 20:41:13 CEST

What do I have to do to get merge conflicts to appear in the
synchronize window in a way that I can resolve them? When I click
"Merge" from the merge dialog, it performs the merge but does not
give me a way to resolve conflicts. I guess I'm used to CVS where I
can preview the merge in the Synchronize window and choose exactly
what from the merge will be applied.

Bradley

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Jun 21 20:41:26 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.