Merge Branches

Heretto CCMS enables you to merge changes between branches and resolve conflicts.

Switch to the branch that you want to merge content from. For more information, see Switch Branches.
  1. If you want to merge a map to another branch, do the following:
    1. In the Content Library, click a map and from the right pane, select Branches.
    2. Click Push Changes > Merge.
  2. If you want to merge a topic to another branch, do the following:
    Note: By default, merging/replacing topics is disabled and the Topic Merge/Replace icon is hidden. To enable this feature, contact a Customer Success Manager.
    1. In the Content Library, open a topic or a map that contains the topic.
    2. In the Topic Toolbar, click the Topic Merge/Replace icon and select Merge.
      Figure 1. Topic Merge/Replace Icon
      Topic Merge menu
  3. In the Merge dialog, from the Into drop-down menu, select the branch that you want to merge to.
    Figure 2. Into Menu
    Branching into menu
  4. If applicable, in the Filter files to be merged section, do any of the following:
    • To only merge the files with given file statuses, complete the File Status field.
    • To only merge the files owned by a given user, complete the Owner field.
  5. Click Continue.
  6. If the Conflict Manager window appears, do the following:
    Figure 3. Conflict Manager.

    The Conflict Manager may contain entries in the following sections: Changed Files, Added Files, and Moved and Renamed Files.

    Branching conflict manager
    1. For each resource or section, select an appropriate option.
    2. If prompted, accept or reject changes and select an appropriate option.
    When every conflict is resolved, a dialog appears.
  7. In the dialog, click Finish.