Controversial:

GIT SUCKS

Why?

No

wat

Equally controversial: Everyone who thinks "Git sucks" just thinks so because they haven't taken the time to learn it properly.

@AlmondSauce even more controversial: same applied to js

@musician Ooohhh. That I cannot agree with. JS is certainly a *lot* better than it was, but it still royally sucks.

Git is awesome and I couldnt work without it but i sometimes wish certain things were more intuitive. Its easy to say that git is easy when you used it for years but some of the error messages and commands arent intuitive at all.

@musician Git's not easy, nor is it perfect. There's certainly a learning curve to it and a lot of the commands could have been structured in a much more logical way. There's also some annoying ommisions (I wish large file support was baked into Git rather than relying on a separate plugin, for instance.)

That said, it certainly doesn't outright suck; it's probably the best version control software out there at this point.

Relevant xkcd

git gud

Is there a better alternative to git for the average use case?

You're a git.

Winform + merge conflict = (jumps out the window)

It's also fun when some smartass commits/pushes the IDE's local configuration files... Had to make a branch from before that happened, as I somehow wasn't able to merge my branch (he pushed the configs to master while I was working on my branch, when the time came to merge my branch into master, boom).

@DarkAngel gitignore