Table of Contents
User Guide
Branching Tab
Branching Tab
The Branching Tab in the Resource Viewer enables you to create and interact with branches.
Creating a Branch
Use the Branching Tab in the Resource Viewer to create a parallel set of content in a new branch.
Overwriting a Branch
Use the Branching Tab in the Resource Viewer to replace all content in a branch with newer content from another branch.
Merging Some Changes Between Map Branches
Use the Branching Tab in the Resource Viewer to merge map branches and select which changes are pushed from the source branch into the target branch.
Merging All Changes Between Map Branches
Use the Branching Tab in the Resource Viewer to merge all changes from one branch into another.
Branching Tab

The Branching Tab in the Resource Viewer enables you to create and interact with branches.
The Branching Tab enables you to branch content, which creates full copies of each component. You can also push changes between branches and compare files in branches.
For more information, see Branching Overview.
Creating a Branch

Use the Branching Tab in the Resource Viewer to create a parallel set of content in a new branch.
  1. In the Content Manager, right-click a map and select Branch .Branching Tab
  2. Click New Branch .

    Expected Result
    The Create New Branch window displays.

  3. Enter a name for the new branch.Enter a New Branch Name field
  4. Click Save.

    Expected Result
    The Branch created dialog displays.

  5. Do one of the following:

    • To switch to the new branch, click OK.

      You are switched to the new branch. The new branch is selected in the Branch drop-down menu.

    • To stay in the current branch, click Cancel.

      You remain in the current branch. The current branch displays in the Branch drop-down menu.

result

A new branch is created.

Overwriting a Branch

Use the Branching Tab in the Resource Viewer to replace all content in a branch with newer content from another branch.
  1. In the Content Manager, right-click a map and select Branch .Branching Tab
  2. In the Source Branch drop-down menu, select the branch that will be used to update the target branch.

    Step Information

  3. In the Target Branch drop-down menu, select the branch that will be updated to match the source branch.

    Step Information

  4. Do one of the following:

    • To replace all modified files, click Replace -> Replace All.

      The Resources Affected By Replace Operation window displays.

    • To only replace files that have been approved, click Replace -> Replace Approved.

      The Resources Affected By Replace Operation window displays.

  5. Click Submit.
result

The target branch is updated with content in the source branch.

Merging Some Changes Between Map Branches

Use the Branching Tab in the Resource Viewer to merge map branches and select which changes are pushed from the source branch into the target branch.
  1. In the Content Manager, right-click a map and select Branch .Branching Tab
  2. In the Source Branch drop-down menu, select the branch that will be used to update the target branch.

    Step Information

  3. In the Target Branch drop-down menu, select the branch that will be updated to match the source branch.

    Step Information

  4. Click Merge .

    Expected Result
    The Merge Branches window displays.
  5. To merge changes from a branch, click Merge .

    Step Information
    The Merge File window displays.
    1. To accept the highlighted change, click Accept .
    2. To reject the highlighted change, click Reject .
    3. Click Save.
  6. To ignore changes that should not be applied to the target branch, click Ignore .
result

The changes in the source branch are pushed into the target branch.

Merging All Changes Between Map Branches

Use the Branching Tab in the Resource Viewer to merge all changes from one branch into another.
  1. In the Content Manager, right-click a map and select Branch .Branching Tab
  2. In the Source Branch drop-down menu, select the branch that will be used to update the target branch.

    Step Information

  3. In the Target Branch drop-down menu, select the branch that will be updated to match the source branch.

    Step Information

  4. Click Merge .

    Expected Result
    The Merge Branches window displays.
  5. Click Add all to target branch.
result

You pushed all the changes from the source branch to the target branch.