Comments on: SVN merge trunk changes to your branch http://stereointeractive.com/blog/2009/02/17/svn-merge-trunk-changes-to-your-branch/ Development Blog Thu, 17 Jun 2010 09:37:20 +0000 http://wordpress.org/?v=2.9.2 hourly 1 By: Andrew Noyes http://stereointeractive.com/blog/2009/02/17/svn-merge-trunk-changes-to-your-branch/comment-page-1/#comment-409 Andrew Noyes Wed, 22 Apr 2009 02:26:40 +0000 http://stereointeractive.com/blog/?p=157#comment-409 I'm a command-line junky myself, but I find SVN almost too obnoxious (overhead-wise) to do from the CLI. I suggest you check out Versions or Cornerstone. Both are excellent. For diff, you can always use FileMerge if you have the Apple Developer Tools installed, or something like Changes or Araxis Merge. I personally prefer Changes. The merge predicament is a common one, so I look it up too almost every time I use it. However, I've adopted a work flow that dodges around it: rather than merging the trunk with my branch, I will simply update the working copy and diff the changes if necessary. Fortunately though, I work with basically no one, so I don't have a big problem with this. I’m a command-line junky myself, but I find SVN almost too obnoxious (overhead-wise) to do from the CLI. I suggest you check out Versions or Cornerstone. Both are excellent. For diff, you can always use FileMerge if you have the Apple Developer Tools installed, or something like Changes or Araxis Merge. I personally prefer Changes.

The merge predicament is a common one, so I look it up too almost every time I use it. However, I’ve adopted a work flow that dodges around it: rather than merging the trunk with my branch, I will simply update the working copy and diff the changes if necessary. Fortunately though, I work with basically no one, so I don’t have a big problem with this.

]]>