Page History
Introduction
At some point you want to leave the current branch (often called 'Trunk') stable and you want to create new functionality in a new separate branch. As soon as this new functionality is tested and ok you want to merge it back to your current (stable) branch.
Steps
To achieve this you have create a new branch. To be able to do this make sure you registered all changes. If you have done that you should go to 'File' > 'Home'. Click on 'Version management'.
Select the correct repository on the bottom and the correct project on top of the left bar. In the ribbon some options appear. One of them are 'New branch'.
You can enter the following fields:
- Branch Type
- Name
- Functional name
- Description
Only 'Name' is required, so enter the name of the branch. At the top left the new branch is shown.
| Note |
|---|
If there were some unregistered changes in the master branch (Trunk), they will not be available in the new feature branch. Only registered changes are processed to the new branch. |
If you open the history of the newly created branch (File > History) you will not see anything that has to do with the newly created branch. This is due to the fact that there are still no changes in the newly created branch. As soon as new changes are registered, you will find an entry in the history log. This entry clearly shows that the change was made in this branch (in the Branch column) and you will also see another color in the branch graph (the first column)In case you are using more than one branch, you also want to merge changes from one branch to another. How you do this is shown in the following steps.
Merge by using Distribute to branch
...
Overview
Content Tools