PingAuthorize

Merging branches

Merge branches to apply all of the changes made in the source branch to the target branch.

About this task

You can only merge committed branches.

If two branches each contain a Trust Framework or Test Suite definition that was created natively in that branch but has the same exact name and hierarchy in the other branch, the merge operation will not complete successfully.

This happens because the duplicated items don’t come from the same source, making the branches ineligible for merge conflict resolution. Rename any such duplicated items in one branch before attempting to merge.

Steps

  1. Click Branch Manager.

  2. Click Version Control.

  3. Select the source branch.

    You can select top-level branches and subbranches.

  4. Click Set branch as Merge Source.

  5. Go to the target branch and click Set branch as Merge Target.

    With the source and target branches selected, the Merge Branches button should appear.

  6. Click Merge Branches.

    The PingAuthorize Policy Editor checks for merge conflicts.

    If no conflicts are found, the changes are merged from the source branch into the target branch. Your merge is complete, and you can skip the remaining step.

    If conflicts are found, complete the following step to resolve the conflicts.

  7. Resolve conflicts.

    If an entity has changed in both the incoming and existing branches, the Policy Editor flags a conflict. You must resolve the conflict for the merge to continue. Conflicts appear in the Merge Conflicts table.

    1. If you need all or almost all of the sections from one branch, click either the Take All Incoming button or the Keep All Existing button.

    2. To examine conflicts one at a time, click Resolve Individual Conflicts.

      On the resulting screen, select the Show diff check box to highlight differences.

      Decide which change to keep and click either Keep Existing or Take Incoming.

    3. After you resolve all conflicts, close the entity difference box.

      The Apply Merge button becomes available.

    4. Click Apply Merge.