> That is to say that git is actually too easy ... until it isn't.

100% true. I am one of those devs who never got any formal training on git or was never motivated to RTFM or even WTFYV (watch the f***g youtube video). I simply started using it and many times ended on StackOverflow when I was stuck.

For a very long time I didn't know that you can create a new branch anytime. I used to make a bunch of changes locally only to realize later that I was in the main develop branch. To "fix" it, I used to copy everything to a temp folder, do a "git stash", then do "git checkout -b newbranch" and redo my changes.