Veritran Docs

Compare Branches

The Branch Comparator page shows a detailed comparison between your selected branch and the Master branch. From this page, you can also update your branch or commit.

To access the branch comparator, select the branch you want to compare from the Branches column and click Compare.

Compare_branches_Icon.png

The Branch Comparator page opens, showing what is new or different between your branch and Master, and highlighting any conflicts. Refer to the annotated image below to learn more.

5656_hpr.png
  1. Commit and Update buttons. Based on the your analysis of the comparison, you can decide to commit your changes or update your branch with the changes from Master. Read Commit Changes and Update Branch to learn more.

  2. Color switches filter the screens and processes to show only those that meet certain criteria. Click any switch to disable or enable it, and combine them as needed.

    • Show New (green): shows screens and processes that are new either in the branch or in Master.

    • Show Difference (purple): shows screens and processes that are different between the branch and Master.

    • Show Conflicts (red): shows conflicts between the branch and Master.

    • Show Deleted (red): shows screens and processes that were deleted in the branch or in Master.

  3. Search bar. Search screens and processes by name, description, tags and update info.

  4. Changes summary: Shows how many changes were found of each type (refer to point 2 above to learn more).

  5. Expand icon. Click to open a particular process or screen for a compared view.

    ComparedView_2.png

    In the example above, the compared view view shows the screen that was deleted in the branch (left) but it is used in Master (right).

    For screens, click the switch to toggle between Visual and XML view. Processes are only shown in XML view. Click the x to close the compared view.