Comment by t-writescode

Have you looked at using a good gui for the repository? I find that helps a lot with the mess.

I used to use Git Extensions and lately I've been using the one built into IntelliJ's products. It's not as good, but it's available on mac, so my options are limited.