Working with branches

In Allegra, every workspace has a master branch. You can branch further from the master branch or from any other branch. In every branch, there is a HEAD version for each document it contains.

Creating a branch

To create a branch in a workspace in the wiki navigator, click the workspace to open the context menu. Select “Create branch”. You can choose between inheritance mode and copy mode. Inheritance mode implies that elements in the target branch are bound to the HEAD versions of the source branch as long as a document in the target branch is not changed. Changes in the source branch are therefore immediately visible in the target branch as well. In copy mode, documents in the target branch are bound to the version of the source branch that was the HEAD version at the time the target version was created. When documents are edited in the source branch, this has no effect on the corresponding documents in the target branch.

Viewing a branch

You can display a branch by switching to it from the context menu of the wiki navigator.

Merging branches

This function is not yet supported.

Comparing branches

Select “Compare branch” from the context menu. In the next pop-up dialog, select the two branches/baselines to be compared. You will get a view similar to the following figure. When you double-click a document, a new screen appears describing the differences between the two document variants.

Viewing branch relationships

For every document that originates from another branch, you have a toolbar button on the “Versions” tab that takes you to the original source document. The tooltip shows you where this document is located. If a document is a member of one or more baselines, another toolbar button opens a list of the reference lines. If a document is the source for a document in other branches, the same toolbar button also displays a list of these documents in the target branches.

Deleting branches

You can delete a branch from the context menu of the wiki navigator.