Branching and Merging

Note: this module requires a branch and merge license

It is possible in Matrix to create a branch of an existing project and later to merge back the changes from the branch into the mainline.

This is mainly meant to support release or feature branches and hotfixes / updates of releases releases.

Tips for branching and merging

  • Try to avoid it - branching and merging is always a challenge

  • If you branch, branch late and merge early - the bigger the time between branch and merge, the more changes, conflicts and questions you will have