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 approved, 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'.

Image Modified

Select the correct repository on at the bottom and the correct project on top of the left bar. In the ribbon some options appear. One of them are is 'New branch'. 

Image Modified

You can enter the following fields:

...

Only 'Name' is required, so enter the name of the branch. At the top left the new branch is shown.

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).

Merge from Trunk to FeatureBranch

When there are new changes in the Trunk branch, it is very easy to merge them to the feature branch. This can be done by moving to the Trunk branch, do some changes, register them. Next you have to do a merge. This can be done as follows:

...

)

...

1. Impact report
2. Conflicts (0)
3. Merged revisions

...

Discard changes

You may have noticed a tiny checkbox in the Distribute to branch overview with the name 'Discard changes'. By selecting this option you explicitly state that you don't want to merge the selected changes. This could be very helpful in case you have to make some changes which are only relevant for that branch, e.g. some test flow or test page. By selecting Discard changes the changes will only remain in the branch in which they have been defined and they will not processed to another branch e.g. Trunk.

In case you accidentally ticked discard changes but you still want to acquire these changes you have to create a temporary branch in which the changes are taken over and merge that one to the destination branch.

...

...