The biggest advantage of svn over git for non-technical users is that you can never end up with commit that then conflicts with another submit (as submits all happen on the server).
I have had various beginner git users get very confused when dealing with conflicts -- I have got myself quite confused on occasion too.
I have had various beginner git users get very confused when dealing with conflicts -- I have got myself quite confused on occasion too.