Sorry to be a pain, but even after the conflict is detected (in Team
Synchronize), the Edit Conflicts menu option is never enabled.
I've tried various things, but no dice. No matter what I do, I cannot get
the Edit Conflicts to be enabled. Under the synchronize, the file is indeed
indicated as a merge conflict (and shows up as the only file when Conflicts
Mode is entered), but the menu item is never enabled. Oddly, neither is
"Mark Resolved" (which I would also expect to be). However, "Mark as Merged"
is enabled.
This seems to be a different issue that I need to search the Mailing List
archives for before continuing this thread.
Thank-you for your assistance,
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:37:34 2006