Can anyone with experience with both SVN and Git comment on the pros/cons of branching and merging (this is something I do often in Perforce). Which would you use based on this one issue?
svn as of 1.5.0 does support merge tracking. I must admit that when first looking into svn I was very surprised to find that it did not originally support it.
Comments
Can anyone with experience with both SVN and Git comment on the pros/cons of branching and merging (this is something I do often in Perforce). Which would you use based on this one issue?
svn's complete lack of merge tracking is simply too painful to use. git will make you much happier.
svn as of 1.5.0 does support merge tracking. I must admit that when first looking into svn I was very surprised to find that it did not originally support it.
I wrote a somewhat long article about Git merging:
http://blog.jrock.us/article/Git%20merging%20by%20example.po...
If branching and merging matters to you at all, switch to git or mercurial immediately.
You won't look back.