I'd try go understand how git works better than you do. I have been using git for 10+ years. Maybe my first couple years, I would get git in a confusing state,

I'd try go understand how git works better than you do. I have been using git for 10+ years. Maybe my first couple years, I would get git in a confusing state, but that never ever happens any more. If you stick with the basics (Level 1), never commit to master: $ git add $ git commit $ git checkout -b $ git pull origin master -r Then trust your webtool to handle merges (github/gitlab), then its really hard to mess things up. level 2 would be understanding how to handle merge or rebase conflicts. Level 3 would be understanding how to use the `git reflog` cmd.