After you completed the SW Carpentry training on git, this is probably an accurate description of your workflow (source: xkcd):
This module introduces you to intermediate and advanced concepts, starting with the concept of branches. You will also learn how to undo things and juggle commits and changes. For this, we mostly rely on the interactive website learngitbranching.js.org, but provide some gapfillers and further reading material in the future.
Prerequisites
The HSF Training Curriculum
This training module is part of the Training Curriculum, a series of training modules that serves HEP newcomers the software skills needed as they enter the field, and in parallel, instill best practices for writing software.