Well - you can drag folders into the left and right dropzones.
Then drag again for ancestor and merge (destination).
That way you get a pretty intuitive view similar to any
subversionclient.
Folders or Files with changes in them have no checkmarks, folders
without have none.
There are hotkeys for merging folders or files as well as the
possibility to review files manually (the way you used it before,
right?).
Of course there is still some amount of action to be taken by
yourself, so this might not be the
fully automated solution you are looking for.
For me, this is the perfect balance between automation and my urge for
control.
(^-^)
Cheers,
U.
On Jun 5, 6:43 am, David C. Zentgraf [EMAIL PROTECTED] wrote:
I love FileMerge, for merging *files*. I find it very lacking for
merging whole tree structures. How do you use it? Am I missing
something?
I poked around a bit more and came across Araxis Merge
(http://www.araxis.com/merge_mac/
), which I just used to merge RC1 into my app. It still has a very
manual feel to it, but does a good job and seems decent enough. Still
on the lookout for something better though. :-3
Has anybody successfully used Changes (http://changesapp.com/)?I gave
it several tries, but was always disappointed.
On 5 Jun 2008, at 12:43, ullumski wrote:
If you haven't tried filemerge yet, i'd suggest you give it a try.
It comes with the OSX- Developer Tools, is free and really does the
trick for me all the time.
Cheers,
Ullumski
David Christopher Zentgraf wrote:
Hi,
With the release of RC1 (Cheers!), I'll use the opportunity to ask
the
list what you use to update your Cake builds.
What's the best tool for you to merge directory structures? Something
like Diff for whole trees.
I tried several tools on the Mac, but none have really worked all
that
well for me.
Actually, the trick that worked best for me is to (ab)use tar, but
I'd
like something with more control.
(http://macdiggs.com/index.php/2007/12/27/merge-two-folders-on-mac-usi...
)
What are you guys using?
Chrs,
Dav
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups
CakePHP group.
To post to this group, send email to cake-php@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/cake-php?hl=en
-~--~~~~--~~--~--~---
