I have been on a Mac now for around a year and a half and one thing I never could understand is when you want to paste a folder with the same name you only have the option to “Replace” or “Cancel”. No merging or syncing like you have on Windows.
Most of the time this hasn’t been a major issue but this weekend I wanted to upgrade my 68 Classifieds TinyMCE module. I keep all my modules in a Google Code svn repository. So I had to keep the svn files. Else it wouldn’t be under version control and I couldn’t commit the new ones.
In my setup I have a folder named tiny_mce and inside this it includes lots of folders and files. You know it is kind of funny it is named “TinyMCE” when it isn’t so tiny. 
So I needed to merge their new version with what I had. Or basically replace everything except the svn files. After doing tons of searching I was coming up with nothing and getting pretty frustrated. I was able to find one mention of something called “ditto”. But this is ran through terminal and I really wanted a nice gui.
To make my long story short I ended up finding this youtube video with tips on how to merge on a mac. This video is from MacMost and covers using FileMerge available free with xcode, ditto, and an app called File Synchronization.
For me I found the ditto method a lot easier than I thought it would be. I fired up Terminal and ran this command:
ditto tiny_mce tiny_mce2 tinymce_new
Then deleted tiny_mce, tiny_mce2 and renamed tinymce_new to the original folder name.
I know for lots of Mac users this may not be a big deal but I spent 3 hours trying to find a workable solution. So I hope this helps any of you with this same problem. If you have any other tips please reply in the comments. I would love to hear them.
