Comments on: Simple Subversion Branching and Merging

By: Sushma Sadanandaiah

Sushma Sadanandaiah — Wed, 03 Nov 2010 01:05:10 +0000

Is there any way to merge the changes from branch A into another branch B without merging individual files? Also, can you carry over history when you merge?

By: Simple Branching and Merging with SVN : Steve Smith's Blog

Simple Branching and Merging with SVN : Steve Smith's Blog — Tue, 16 Mar 2010 16:50:11 +0000

[...] If you’re using Eclipse, there’s a nice write-up of the steps required by Zach Cox that I found helpful here. [...]

By: Sudhakar Ramasamy

Sudhakar Ramasamy — Thu, 04 Mar 2010 20:35:24 +0000

I’ve had better luck in general with subversive over subclipse. But the one thing I haven’t figured out yet in subversive is the merging piece.

I use TortoiseSVN to do all the merging. Anyone else have luck merging changes using subversive?

By: Jim Chrystal

Jim Chrystal — Thu, 04 Mar 2010 16:48:36 +0000

Yeah, it’s pretty much the same. It’s a little trickier to install, as you need to include two separate Eclipse dependencies to get it to work. I generally build my own Eclipse by user the online configuration tools a yoxos.com.

http://ondemand.yoxos.com/geteclipse/start?profile=-868129468_1203489369236495480

By: Zach Cox

Zach Cox — Wed, 03 Mar 2010 21:22:37 +0000

Good to know! I’ve never actually used Subversive, is branching and merging similar?

By: Jim Chrystal

Jim Chrystal — Wed, 03 Mar 2010 21:12:52 +0000

Thanks for taking the time to write this blog post. This is excellent information for someone needing to merge SVN artifacts. Just a note, if you use the Subversive plugin, you can delete branches