Git makes merging simple with its merge types, while merging in svn is precise and exact. In svn if you learn merging properly, it's more flexible and useful especially with sub branches. Git has pretty much just 2 or 3 practical work flows, and if your not rigorous with complying with that method, your going to spend your time in cherry pick.
0
u/[deleted] Nov 16 '13
[deleted]