1) FileMerge asks you for a merge folder when you want to save
changes. Now, I'm not sure I've ever in my life wanted to save a
merge into a third location - I always want to merge changes from
one file into another. There should be an option to merge into the
right hand folder, and the folder selection dialog should come up
pointing to that folder by default. I have many times accidentally
saved merges into the wrong folder, sometime destroying perfectly
good files.
2) To apply a diff from one side to another FileMerge uses a popup
button control for which there's no keyboard shortcut. This is
needlessly tedious - it should have a button and a menu item so you
don't have to wear out your fingers clicking and dragging when you
want to apply a thousand changes in a merge.
I find CW or TextWrangler much safer and faster for file merging
than FileMerge because of these two reasons. They're not huge
things to fix though and I'd happily switch to FileMerge if they were.
I don't have much of an answer for your first complaint. However you
should know that there indeed are keyboard shortcuts. Try using the
down & up arrows to move between differences, and the left and right
arrow to 'choose' which version you want.
One complaint that some of my coworkers have is that it is difficult
to compare two separate files from within XCode. It sure would be
nice if XCode had a dialog similar to CodeWarrior's compare dialog,
specifically one that has popup's to choose which files you want to
compare (and where to save the resulting merge file).
-- David Dolinar, Software Developer
-- Directory Resources, LLC
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/xcode-users/email@hidden
