This flowchart[1] has been useful to me a few times when I've been lost on how to fix something. I usually keep it as a bookmark, but I don't have it saved on this computer, so I just did a google image search and was able to fine it fairly quickly. A google image search for "git solution workflow" or "git fix flowchart" finds it right away, in case this tickles your brain in the future and you want to find it again, and vaguely remember it's easy to find through image search.
Edit: Updated the link to go to the site referenced in the image. Might as well send you to who developed it so they get some credit.
Edit: Updated the link to go to the site referenced in the image. Might as well send you to who developed it so they get some credit.
1: http://justinhileman.info/article/git-pretty/