[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: Daniel Serodio <daniel.listas_at_xxx.com.br>
Date: 2006-06-22 18:43:16 CEST

Mark Phippard wrote:
> Bradley Wagner <bradley.wagner@hannonhill.com> wrote on 06/21/2006
> 02:41:13 PM:
>
>> 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.
>>
>
> You can't. Subclipse does not use the Synchronize view for merges.
>
Is this feature planned? Waiting for some Eclipse bug?

TIA,
Daniel Serodio

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Jun 22 18:43:55 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.