Re: conflict editor

"Tom Heaton" <Tom.Heaton@cellectivity.com> wrote on 07/05/2005 11:05:27
AM:

> I don't understand how this works. It shows the conflicts very nicely
and I
> can move between merged/their versions. But I can't mark a conflict as
> resolved and get rid of all the additional subversion file versions.

The Mark Resolved action should be enabled in the Team menu when you
select the file. This, and several other options are also available as
"Quick Fixes" from the Problems view. You may have to click the Filters
button in this view to enable showing our problem markers.

> Is there an equivalent of Tortoise's "use their/your text block".

You can configure TortoiseMerge as your conflict editor in the
preferences. That is what I use. The built-in conflict editor is
provided by Eclipse. We just provide the editor the content, it provides
the UI. I seem to recall that by default, "your" changes are already
selected, and you can then choose to replace your change with "their"
change or insert "their" change before/after. Just click the arrow on the
conflict for choices.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Wed Jul 6 01:45:09 2005