I moved all my projects and code over to git from svn about a year ago. My workflow has improved tremendously as a result - especially working in larger teams.

I moved all my projects and code over to git from svn about a year ago. My workflow has improved tremendously as a result - especially working in larger teams. That being said, resolving conflicts in git has almost always been more difficult and counter-intuitive than resolving conflicts in SVN. With git, you have to learn the "right way" to do it, which typically involves several steps or a "git reset --hard origin". I can understand the frustration coming from the guy in the linked post that this post is a response to.