This is honestly where I think good git GUI tools help, and for those I go to Git Extensions, or did until I had to use a Mac for work. I learned enough using

This is honestly where I think good git GUI tools help, and for those I go to Git Extensions, or did until I had to use a Mac for work. I learned enough using it that I can work through most issues in a regular and natural way nowadays.