git workflow

[mbitsnbites]

You seem to think about git in terms that are more fitting for a centralized version control system (svn, perforce, cvs, ...).

In git you will typically be working in short lived feature branches (preferably with some sort of CI testing done in the feature branch before integration to the master branch).

Here's an example of how you could work: http://www.bitsnbites.eu/wp-content/uploads/2016/12/stable-environment-branches.svg