|

That's the initial situation. We have an initial code import, a recently created baseline, and we'll start working from that. The branch explorer reflects the intitial situation.

Branches can now be created from the branch explorer. Right click on a branch to display the pop up menu, select create child branch as you'd do from the branches view, and you've a new branch.
You can switch your workspace to work on a specific branch also from the branch explorer.

At a certain point in time your development could look like the graphic.
A couple of task branches, one of them with three commits (changesets), and the other one with only one.

You continue working and then you make more an more changes on the branches.
The branch explorer correctly displays how the parallel branches evolve.

Now it's time for an integration. You can highlight the branches with pending integrations from the branch explorer.

Before merging it's probably a good idea to review what has been changed on the branch. Just right click on it and pop up its context menu, then click on "compare branch content"

The code review helper tool will show the changes made on the branch. It is easy to check what has been exactly changed.

It is also possible to select a specific changeset, and explore the changes it contains.

The changeset content will be displayed on a changeset view.

The merge dialog can be triggered from the branch context menu. After the first branch is merged, the situation reflects the one at the figure.

Now the filter will only find one branch with pending integrations

And then the second branch is integrated.

Double clicking on a merge arrow, the merged files and directories will be displayed.

Then the integration is finished and a new baseline will be created. To do so a new label (Release 11) is created and applied.

Development continues, new task branches are created, and even a maintenance one. The branch explorer reflects the new situation.

Conditional format rules can be applied based on standard Plastic queries to highlight branches matching certain criteria.
|