How to: Merge an Application Branch

Overview

In this how-to guide, you'll learn how to use Unqork's Application Versioning feature to merge An app versioning Merge combines changes from one branch or draft, into another branch, draft, or published version of an application. branches of your application. Merging lets you insert changes from a branch into another version, thereby creating a new branch. After merging changes, Creators Also known as Unqork Users, or Designer Users; is anyone who is inside the Unqork platform. can publish the primary version to update their application.

Discover how to create and publish branches in our How to: Create and Publish an Application Branch article.

Accessing the Merge Tool

To access the Merge tool, open the application or module's Branch & Version Management pane at the Application level or in the Module Builder. Then, navigate to a branch or published application version and click the (merge) button.

Branches can only merge into published versions, or other branches. You cannot merge a branch into itself.

Using the tabs below, access the Merge tool:

Access the Merge Tool to Merge Into Another Branch

To merge branches into other branches, you'll use the Branch & Version Management pane.

To merge An app versioning Merge combines changes from one branch or draft, into another branch, draft, or published version of an application. a branch into another branch:

1. Navigate to your versioned application.
2. At the top of the Application level page or the Module Builder, click the (branch) button. The Branch & Version Management pane displays to the right.
3. In the Branches of X list, navigate to a branch you wish to merge, and click the (merge) button. The Merge tool displays.

Access the Merge Tool to Merge Into a Published App Version

To merge branches into the published application version, you'll use the Branch & Version Management pane.

Merging a branch into a Published App Version creates a new branch. To publish changes from a branch, follow our How to: Create and Publish an Application Branch article.

To merge An app versioning Merge combines changes from one branch or draft, into another branch, draft, or published version of an application. a branch into a published app version:

1. Navigate to your versioned application.
2. At the top of the Application level page or the Module Builder, click the(branch) button. The Branch & Version Management pane displays to the right.
3. Click Published App Versions.
4. In the Published App Versions list, navigate to a published version you wish to merge, and click the (merge) button. The Merge tool displays.

Understanding the Merge Tool

A static image displaying the Application Versioning's Merge page.

The Merge page displays the following information:

  Attribute

Description

1

Merge

After reviewing and resolving conflicts, click the Merge button to combine the Source branch into the Target version.

Merging a branch into a Published App Version creates a new branch. To publish changes from a branch, follow our How to: Create and Publish an Application Branch article.

2

Cancel Merge

Cancels the merge An app versioning Merge combines changes from one branch or draft, into another branch, draft, or published version of an application. and returns the Creator to the Module or Application view.

3

Source

Displays the branch containing the changes you want to merge into the Source version.

 

☐ Discard Branch after Merge

(Branches only)

Set to Checked Box Icon (checked) to delete the Source branch after the merge completes.

4

Target

Displays the branch or application version that is modified by the Source version once the merge is complete.

 

☐ Discard Branch after Merge

(Branches only)

Set to Checked Box Icon (checked) to delete the Target branch after the merge completes.

The Discard Branch option is not available for published application versions.

5

Switch Order

Switches the Target version and the Source version.

6

Output Branch Name*

Enter a name for the new branch. After merging, the Output Branch Name displays as a red pill in the Module Builder and Branch & Version Management pane. For example, entering V1.3-Merge in the Output Branch Name field creates V1.3-Merge.

*This field requires a value to merge.

 

 Review and Resolve Conflicts

Contains the Proposed Changes and Unchanged elements lists. Evaluate and accept any changes displayed in the Proposed Changes list.

7

Proposed Changes

Displays a list of elements that were modified from the Target version. Review and accept elements to include them in the merge.

The list does not display if there are no changes between the Source and Target version.

 

Accept All

Selects all elements to merge, setting all ☐ (unchecked) boxes in the Accept column to Checked Box Icon (checked).

 

Clear Accepted

Deselects all elements to merge, setting all Checked Box Icon (checked) boxes in the Accept column to ☐ (unchecked).

 

Element Name

The name of the element.

 

Change

The type of change made to the element.

Changes 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.

 

Type

The type of element. Elements include Modules.

 

Accept

After reviewing changes to the element, set to Checked Box Icon (checked) to include it in the merge.

By default, boxes in this column are ☐ (unchecked). Unchecked elements are not included in the merge.

8

Unchanged

This table displays a list of elements that do not require review or approval because they are unmodified.

Merging

After accessing the Merge page, Creators Also known as Unqork Users, or Designer Users; is anyone who is inside the Unqork platform. review and accept proposed changes between the Source and Target version. You can merge An app versioning Merge combines changes from one branch or draft, into another branch, draft, or published version of an application. branches into other branches or published application versions using the same merge process.

Merging creates a new branch. To publish a branch, view our How to: Create and Publish an Application Branch article.

To merge a branch using the Merge tool:

1. In the Output Branch Name* field, enter a unique name for the output branch.
2. In the Proposed Changes list, click Review. The Merge Review page displays.

To see setting descriptions for the Merge Review page, view our Application Versioning Merge Review Tool article.

3. Review each element in the Change Application Elements list. Elements in this list contain a table displaying the element name, type, and how its been changed.
4. After confirming changes, set 1 of x Accept Changes ☐ to Checked Box Icon (checked).

If there are more than one module elements that have changed, click Next Conflict >, then repeat step 4.

5. Click Return to Merge Settings.
6. In the Proposed Changes list Accept column, verify elements have been Checked Box Icon (checked) .

To prevent a change from being merged, leave the box ☐ (unchecked).

7. Click Merge. The Merge confirmation modal A modal is a window that appears on top of the content you are currently viewing. displays.
8. Verify the Source, Target, and Output Branch Name name, then click Confirm.

The page refreshes and displays the new application branch. The Merge pill displays the Output Branch Name.

Resources