The amount of FUD you've expelled about Git the last few days is suggesting to me that you got burned by it at some point. That sucks, but some of the stuff you

The amount of FUD you've expelled about Git the last few days is suggesting to me that you got burned by it at some point. That sucks, but some of the stuff you've been saying is just flat-out wrong. If you're getting as many merge conflicts with Git and as you were in Subversion then something is seriously broken with your team's development strategy. Git is built with a much better merge algorithm, such that conflicts should happen less often. Git was built to merge hundreds of lines of kernel code every day, and if it didn't do that quickly and accurately, there would have been no point to the project. The extra complexity you speak of is negated by the fact that you don't have to use the "confusing" features if you don't want to! This is the number one thing that upsets me when people give Git a hard time. 99% of the time I come across someone that says Git sucks is because they ran a command like 'git-filter-branch' when they were trying to do something clever and it wiped out their data. I don't Git should have to apologize for giving more power to developers as long as they're comfortable using it.