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

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.

Conflicts are produced in the files themselves. They are decorated with a
conflict marker and there is also an entry in the Problems view along with
various Quick Fix actions. On the Team menu or Quick Fix menu you can
choose an Edit Conflicts action that launches the Eclipse 3-way merge for
the file. In preferences you can configure an external editor such as
TortoiseMerge. Once the conflicts have been resolved, save the file and
then use the Mark Resolved action to let Subversion know you have resolved
the conflicts.

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 02:31:15 2006