Typically workflow is like this for a release
$ git checkout master -b 0.1.x # or whatever version numberThings get done, version number get set up.
$ git commit -m package-0.1.0
$ git tag 0.1.0The master branch should stay in sync - and if everything there
should be moved to the next patch release
$ git checkout master -b rebase
$ git rebase -i 0.1.x # drop commits that are not needed
$ git checkout 0.1.x
$ git reset --hard rebase
$ git branch -d rebaseAll the above sbould complete without errors. Now bump the version.
$ git commit -m package-0.1.1
$ git tag 0.1.1