[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: Bradley Wagner <bradley.wagner_at_hannonhill.com>
Date: 2006-06-22 20:00:16 CEST

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

Bradley

On Jun 22, 2006, at 1:51 PM, Mark Phippard wrote:

> 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

---------------------------------------------------------------------
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:00:30 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.