Merging from a release branch to devel

At any given time we will several branches with which we are working.

This document describes how to merge changes from one branch into another. It gives the merge from release-2.0.0 to devel as an example but can be applied to other branches.

TO BE CONTINUED...