Recipe 2.4 Finishing a release branch

Problem

The state of the release branch has reach the quality for a release.

Solution

• The release branch is merged into master (since every commit on master is a new release by definition, remember).

$ git checkout master

$ git merge --no-ff release-1.2

• The commit on master must be tagged for easy future reference to this historical version.

$ git tag -a 1.2

• To keep the changes made in the release branch, we need to merge those back into develop.

$ git checkout develop

$ git merge --no-ff release-1.2

• The previous step may well lead to a merge conflict. If so, fix it and commit.

• Now we are really done and the release branch may be removed, since we don’t need it anymore.

$ git branch -d release-1.2

Discussion