Comments on: SVN merge trunk changes to your branch

By: Aartist

Aartist — Wed, 26 Oct 2011 19:43:40 +0000

I was able to use this nicely.

Thanks for the write-up.

By: Patrick

Patrick — Wed, 29 Jun 2011 08:04:17 +0000

Thanks for share.

By: Updating branch with changes from trunk. « Talueee's Blog

Updating branch with changes from trunk. « Talueee's Blog — Fri, 21 Jan 2011 11:25:03 +0000

[...] Link [...]

By: Wayne Khan

Wayne Khan — Sat, 28 Aug 2010 01:01:18 +0000

Thanks, this was really helpful!

By: ITtuition.com

ITtuition.com — Fri, 14 May 2010 10:20:18 +0000

Thanks for your work!

–
Piotr

By: Andrew Noyes

Andrew Noyes — Wed, 22 Apr 2009 02:26:40 +0000

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.