A basic git workflow diagram to quickly consult if you are having doubts about on what to do with your git mess. Also, I strong recommend you to use some GUI, for general purposes git-gui is more than enough.
Shout out for git-sim, where you can simulate Git operation before doing it.
Please be aware that this is not a tutorial of any kind, it is just a fast way to remember what to do in your daily git workflow. This is not a substitute for the official git documentation or whatever your company is doing.
Git workflow diagram by eHonnef is licensed under a Creative Commons Attribution 4.0 International License.
Based on a work at https://github.com/eHonnef/git-workflow-diagram.