Git is still awful

In case it’s not obvious from the title, this is mostly just a rant. For the longest time, I was a Mercurial holdout and used it for every personal project where the choice didn’t affect other people. After a long time, I finally switched when: git had won (GitHub etc.) and, Magit gave me a decent interface, better than the Mercurial CLI. But it is still awful. We can forget. I consult for a team of developers, and it involves people who are not software developers by trade who are learning to program and therefore also learning to use git. Trying to help them through this is the most embarrassing part of my job – the part that makes me feel like we, as software developers, are a bunch of amateurs. The other day I coached a work colleague through a problem. He is a very intelligent guy and a talented mechanical engineer, who is now picking up coding. The part he struggles with most of all is not all the coding, but git, to the point that he was ready to “throw the computer out of the…