Application Versioning Merge Review Tool

Overview

Merge Review is the process of reviewing changes of a branch A branch is a copy of modules in an Unqork application that helps Creators work in parallel. Branching an application can seperate in-progress changes from release-ready modules. using Unqork's Application Versioning tool. Creators Also known as Unqork Users, or Designer Users; is anyone who is inside the Unqork platform. 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 A Property ID is the unique field ID used by Unqork to track and link components in your module..

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.

Reviewing and Accepting Changes

Use the Merge Review tool to inspect each individual element changed between the branch and target module. After all modified elements are inspected, accept the changes. Or, return to the Merge Settings page.

To access the Merge Review page, you must start the application merge process. Learn how in our Merge an Application Branch article.

To review changes on the Merge Review page:

1. In the Change Application Elements list, select a module for review. If the module exists in the branch and the target, then the Element Review list displays.

Application elements, like modules, do not display an Element Review list if they are added or removed in the branch.

2. In the Element Review list, review each row and verify each element's change meets your requirements.
3. (Optional) Inspect individual changes to Modified or Added elements by clicking the (View Diff) button.
4. To approve all changes to the application element, set x of x Accept Changes ☐ to Checked Box Icon (checked). If the application element does not meet your requirements, leave the box ☐ (unchecked).

Unchecked application elements are not included in the merge. Verify all other changes will not affect the unchecked application element.

5. Click Next Conflict > to move onto the next application element and repeat the process.
6. After reviewing all application elements, click Return to Merge Settings.

The Merge Settings page displays, and elements with accepted changes display the Checked Box Icon (checked) symbol in the Proposed Changes list's Accept column.

7. Continue the merge process detailed in our How to: Merge an Application Branch article.

Resources