I'm hopefully waiting for a new and easier alternative way of version controlling. I don't have any idea how it should be, but git's approaches are so complicated, possibly because of it is designed for so complicated projects.

git is pretty great.

What specifically do you find _hard_ or _complicated_?

Once you have a decent mental model of git, it works well. Using git with magit is excellent.

Before I had a good mental model of git, I would've been comfortable with flows like 'add, commit, push' (and the smallest amount of branching from that; 'checkout -b', 'pull'). -- I wasn't able to easily dig myself out of holes I got into if I made the wrong command.

The repo "git flight rules", which explains how to fix problems you get into, has 33k stars. https://github.com/k88hudson/git-flight-rules