OK, I found out what I needed to do. For the Edit Conflicts to show up, I
needed to do a Team->Update on the folder that contained the known merge
conflict. This changed the Icon on the offending file from '*' to 'x' which
then allowed me to Edit Conflicts which produced the external editor.
Sorry for the confusion - that is a usage pattern we never use.
What our engineers do is go to the root folder of the project, Right-Click
and choose Team->Synchronize. Then, for all the merge conflicts that show up
there, they expect to be able to merge using the defined Merge tool. I do
think this is a reasonable expectation, and a reasonable usage pattern, but
unfortunately, without doing the Team->Update, you can't merge.
I hope that explains my confusion - thanks for the indulgence of the list
participants.
Marc
-----Original Message-----
From: Mark Phippard [mailto:markp@softlanding.com]
Sent: Tuesday, August 08, 2006 10:23 AM
To: users@subclipse.tigris.org
Subject: RE: [Subclipse-users] External Diff/Merge doesn't seem to work
"Marc Batchelor" <mbatchelor@pentaho.org> wrote on 08/08/2006 10:20:07 AM:
> Thank-you for your explanation, but given the additional information,
I'm
> still unable to get Araxis Merge to start.
>
> Here is what I did to attempt to force the issue:
>
> A- Modified my Merge parameters to specify the third (base) and merged
file
> parameters.
> B- Re-started Eclipse (just to be certain).
> C- Did a Team->Synchronize to see what my incoming changes were.
> D- Modified a file that I knew was incoming thus creating a merge
conflict.
> E- Closed the Synchronization and did another one (just trying to
> avoid boundary cases).
> F- Double-clicked on the file that now has a merge conflict.
>
> Again, no joy. The only thing that happens is the built-in compare
> tool appears. Checked the console and find no errors.
>
> Other things I tried:
>
> 1- Switched to conflict mode in Synchronize - no difference
> 2- From Navigator, right-click on file and choose Compare With
You would have to do Team -> Edit Conflicts to open the external merge
program.
I use TortoiseMerge, so I know the feature works.
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 Tue Aug 8 16:48:14 2006