Finally someone agrees with me! Yey!

Kidding aside, git-merge is simpler because you only need to know 6 commands: co, add, commit, push, pull and merge. I believe that these will help you achieve everything you need with git.