Comments on: Branch merging with Subversion

By: /kspg/blog/From Subversion to GIT: Part 1/

/kspg/blog/From Subversion to GIT: Part 1/ — Sun, 19 Apr 2009 21:52:21 +0000

[...] used in Subversion, and the reason for this is that both branching and merging are expensive, time consuming and error prone operations. However, in GIT, these operations are really cheap, effective and [...]

By: Aiden

Aiden — Tue, 20 Jan 2009 18:41:50 +0000

Thank you. This was helpful, for now. I’ve been keeping a close eye on the release notes and even when merge tracking is finally delivered, it still appears to be a nightmare to maintain.

I thought some of you experiencing merge pain would find this useful as well. It did us.

http://www.accurev.com/scm_comparisons.html

By: DWORD

DWORD — Mon, 21 Apr 2008 21:30:08 +0000

Thanks for the tip! I’ve been doing a lot of manual branch management, basically doing what it appears svnmerge is doing by hand, but I never took the time to look into automated tools; this looks really useful.

By: KungFooMasta

KungFooMasta — Mon, 21 Apr 2008 18:07:43 +0000

Thanks for the information, it has cleared some details about merging for me.

By: Zorocke

Zorocke — Sun, 20 Apr 2008 22:15:12 +0000

Great article! I have added a link to it from the wiki on my new site for software development.

By: ghoulsblade

ghoulsblade — Sun, 20 Apr 2008 14:27:39 +0000

thanks, that was really encouraging to look more into branching/merging details =)

By: Steve

Steve — Sun, 20 Apr 2008 11:41:34 +0000

@No: http://www.ogre3d.org/phpBB2/viewtopic.php?t=40802

@futnuh: glad to be of service

By: futnuh

futnuh — Sun, 20 Apr 2008 04:53:45 +0000

Thanks for the insight Steve – these kind of workflow posts are incredibly valuabel. In the past I’ve avoided branching and merging completely … no longer.

By: No

No — Sat, 19 Apr 2008 20:35:26 +0000

when will Ogre use SVN?