Feature branches

How to use feature branches

Name and location

Create a feature branch within the context (folder) of the application or component it applies to. Its name should consist of the task number (without the #) followed by space, -, space and a short clear description like 1000 - Column selection in tables.

Method

We preferably use the classic feature branches as described in the SVN Book:

  • Create a feature branch from trunk (or any other branch)
  • Regularly update your feature branch from trunk to keep the branches in sync. This can be done in SVN using the auto-merge feature on the feature branch. In TortoiseSVN you can select Merge > Merge a range of revisions > Specific range (without specifying the range).
  • Once work is finished update the feature branch from trunk one last time.
  • Reintegrate the feature branch into trunk. This can be done in SVN using the auto-merge feature on trunk. In TortoiseSVN you can select Merge > Merge a range of revisions > Specific range (without specifying the range).

If you want to cross-merge changes to another branch, it is best to merge the revision that contains the reintegration merge from the source branch. It is harder to merge from the feature branch itself.