[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [Subclipse-users] External Diff/Merge doesn't seem to work

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-08-08 16:22:37 CEST

"Marc Batchelor" <mbatchelor@pentaho.org> wrote on 08/08/2006 10:20:07 AM:

> Thank-you for your explanation, but given the additional information,
> 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
> 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
> 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

I use TortoiseMerge, so I know the feature works.


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:22:49 2006

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.