Recently I tried Tourtoise git and I came to the conclusion that a beginner will probably rather learn the cmd line version because he will otherwise loose code.
SVN is unbelievably more difficult. The entire conceptual process of merging/rebasing/reintegrating is so much more difficult in SVN than git that I really cannot understand how people cope. Branches in SVN are such a pain in the ass that feature branching becomes a nightmare barely even worth doing. I get migraines trying to keep straight what things in SVN make changes on the server and what things make changes locally only that I can sit on for a while. Being centralized seems to raise the stakes of just about every operation, whereas with git I can take it slow, get everything right, and not involve other people until I decide it is the right time to do so.
A month-long stint of working with another team that uses SVN for some incomprehensible reason left me seriously considering seeing a doctor about some blood pressure medicine. I swear to the gods I would rather use quilt.
The pain here is not because git is inherently harder, but because you'd gotten used to svn (including your conflict workaround) and I guess nobody wants to do the same learning for git.