Page History

...

1. Go to Home
2. Select Version management
3. Merge the feature branch to Trunk.
4. Select the correct revision.
   
5. Click on Merge.
6. The system checks the branches and shows up a conflict:
   Image Added
7. You click on Apply and click Close.
8. When you open the project of branch Trunk a warning will be shown on the bottom of the window:
   Image Added
9. You can either click on the message or go to File > Conflicts
10. The following will be shown:
    Image Added
11. To know what the difference between these two versions are, click on Compare content.
12. A new window will appear:
    Image Added
13. We merged the changes from FeatureBranch to Trunk. Blueriq acts as if this merge was successful, so the element from the FeatureBranch is taken as the current element in this branch (Trunk).

14.  

...