SVN was created to to be the easier version of CVS and it did fix a lot of the CVS strangeness. However, I've worked with SVN a fair bit and it frequently stumps me on things that I think should be simple. I've never tried git so I can't comment on it. John