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

Daniel Serodio <daniel.listas@xxx.com.br> wrote on 06/22/2006 12:43:16 PM:

> 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?

See this reply from last weekend:

http://subclipse.tigris.org/servlets/ReadMsg?list=users&msgNo=7020

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:32:14 2006