Integrator Workflow

Wiki ▸ Integrator Workflow

Your team has decided to give an ok to integrate a pull request (PR) in master, you are given the task to merge it.

Preconditions

1. You have already cloned the repo, see Workflow Initialization.

2. Your master branch is up-to-date

   (master) $ git pull

3. The release branch (i.e. 201605-release) or fix (i.e. 201605-release-fix02) has successfully been build by TravisCI and has no merge conflicts

4. you configuration is such that tags will be pushed with commits (this is needed only once per machine):

   $ git config --global push.followTags true

Steps

1. tag the latest release/fix commit so that Travis CI will automatically trigger a deployment when you will merge:

   (website/master) $ git checkout 201605-release-fix05
   (website/201605-release-fix05) $ git tag -af v2.5.5 -m "Fifth Fix for May 2016 Release"
   (website/201605-release-fix05) $ git push origin --follow-tags --set-upstream origin 201605-release-fix05

2. PR or fix branch can be merged via the web browser or the command line:

   (website/201605-release-fix05) $ git checkout master
   (website/master) $ git merge 201605-release-fix05
   (website/master) $ git push

3. Check TraviCI and euctrl-pru.github.io branch

4. If all is ok, tag it as a release or a bug-fix

   # tag latest commit as a bug fix, i.e. 2.3 is a release while 2.3.x is an x fix between two releases
   (website/master) $ git tag -a v2.3.2 -m "update XYZZY."