[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 19:51:10 CEST

Bradley Wagner <bradley.wagner@hannonhill.com> wrote on 06/22/2006
01:39:04 PM:

> Mark, will doing a Team->sychronize after a merge have the same
> effect as a compare with base revision? Should it report any files
> with the "-left" and "-right" conflict files?

A merge is just an automated process to make changes to your working copy.
 Once it is complete, it isn't much different than if you had typed in the
changes. The exception being conflicts that it might have produced. If
you do Team -> Synchronize, it will do what that would have done if you
types in the changes. I believe the conflict files show as outgoing
unversioned changes.

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 19:51:29 2006

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