Application Versioning Merge Review Tool

Overview

Merge Review is the process of reviewing changes of a branch using Unqork's Application Versioning tool. Creators use the Merge Review tool to see a detailed change list of application elements, and then accept or reject the changes. Once all changes are reviewed, Creators return to the Merge Tool page.

To learn more about the Merge Review page, and how to review and accept changes, click the tabs below.

Understanding the Merge Settings Page

A static image displaying the Merge Review page, numbers on the image correspond to the numbered rows in the the list below.

 

Setting

Description

1

Return to Merge Settings

Click to return to the Merge Tool page. Any changes accepted on the Merge Review page display in the Merge Tool page's Proposed Changes Accept column.

2

Change Application Elements List

This list displays all application elements that have changed in the branch. After reviewing an element, a checkmark displays next to the application element's name.

The review checkmarks are not required to return to the Merge Tool page, they only indicate the application element has been viewed by the Creator.

3

Total Modified Elements

Displays the total elements changed and the type of change made. The following types include:

  • Modified: This element contains changes that are different from the Target version.

  • Removed: This element will be removed from the application on merge.

  • Added: This element will be added to the application on merge.

4

Element Review List

Displays a list of elements changed in the branch.

5

Name

Displays element's Property ID.

6

Type

Displays the element type. If the application element is a module, then this is typically a component.

7

Change

The change column indicates how the element was modified. Change types include:

  • Modified: This element contains changes that are different from the Target version.

  • Removed: This element will be removed from the application on merge.

  • Added: This element will be added to the application on merge.

8

Details

Click the (View Diff) button to display a list of changes to the element. This button is disabled for Removed elements.

The change list includes the following attributes:

  • Property: The component's property that has been modified in the branch.

  • Diff Type: If the element was Added, Modified, or Removed.

  • New Value: The component's property value that will change on merge.

  • Old Value: The component's previous property value that will be overwritten on merge.

If the property does not have an old value, then it displays as N/A.

9

< Previous Conflict

Navigate to the previous changed application element. This button is disabled when the first element in the Changed Application Elements list is selected.

10

x of x Accept Changes ☐

This button displays the current Application Element value, and the total Application Elements that changed. For example, if two modules were changed in the branch, then the first half of the button displays as 1 of 2.

To approve the changes to the application element, set Accept Changes ☐ to Checked Box Icon (checked). This setting updates the checkbox in the Merge Tool page's Proposed Changes Accept column.

11

Next Conflict >

Navigate to the next changed application element. This button is disabled when the last element in the Changed Application Elements list is selected.

Resources