I don't agree with having some of these alias here

for instance, I dislike the `git rh` alias, or anything that will make me easier to screw up (I prefer to do the more dangerous commands the hard way)

Also, since each of us may have our preferences (i.e. I could be using `co` for commit instead of checkout), I think it would be better to just stick to new commands here, like `conflicts`, and not abbreviating existing ones