Comments on: Merge two folders on Mac using Terminal and tar http://macdiggs.com/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/ Digging the watery grave and talking about PHP, Rails and tech stuff.. Tue, 06 Jan 2009 10:14:53 +0000 http://wordpress.org/?v=2.6 By: Bob http://macdiggs.com/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/#comment-27173 Bob Sat, 07 Jun 2008 08:36:02 +0000 http://macdiggs.com/index.php/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/#comment-27173 Have a look at ECMerge. It's a diff/merge tool running on Windows & MacOS, but also Linux and Solaris. It does side by side and 3-way merge for files and folders. You can use it to merge SVN branches or any other directory. Have a look at ECMerge. It's a diff/merge tool running on Windows & MacOS, but also Linux and Solaris. It does side by side and 3-way merge for files and folders. You can use it to merge SVN branches or any other directory.

]]> By: Curtis Chambers http://macdiggs.com/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/#comment-27073 Curtis Chambers Mon, 07 Apr 2008 04:54:09 +0000 http://macdiggs.com/index.php/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/#comment-27073 I'd also add that at the end I'd do an "svn add * --force" to make sure that any new files that have been added are included in SVN. Sometimes there are little files many folders deep that have been added that you have no idea about since the default svn add skips folders that it already knows about. I'd also add that at the end I'd do an "svn add * –force" to make sure that any new files that have been added are included in SVN. Sometimes there are little files many folders deep that have been added that you have no idea about since the default svn add skips folders that it already knows about.

]]> By: Terrell http://macdiggs.com/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/#comment-26578 Terrell Wed, 09 Jan 2008 16:44:27 +0000 http://macdiggs.com/index.php/2007/12/27/merge-two-folders-on-mac-using-terminal-and-tar/#comment-26578 Very nice. I've been manually moving files around (or svn rm and svn add'ing) manually. This is obviously much better. Very nice.

I've been manually moving files around (or svn rm and svn add'ing) manually.

This is obviously much better.

]]>