I am currently solving the same problem and what helped me a lot was the Git manpage about workflows: https://www.kernel.org/pub/software/scm/git/docs/gitworkf

I am currently solving the same problem and what helped me a lot was the Git manpage about workflows: https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html https://www.kernel.org/pub/software/scm/git/docs/gitworkflow...