Merge Branches

Filter by IDE
Select the Progress AppBuilder client you are currently using for development.

IDE

This article is applicable to the in-browser client, the universal desktop client and the classic Windows desktop client. For information about version control in the extension for Visual Studio, see Use version control in Visual Studio.

After completing the development in a version control branch, you can merge the branch with all its changes and its history in another branch.

AppBuilder merges the selected branch into the current local branch, performing a fast forward merge. If you have configured third-party version control, you need to push the resulting merged branch to the remote repository.

A local branch is the branch of your private repository managed by the built-in version control services. In the Provider cell, a cloud icon indicates that the branch is local.

A remote branch is a branch of the remote repository managed by your third-party Git provider. In the Provider cell, a Git provider-related icon indicates the branch is remote.

Prerequisites

  • Verify that your preferred AppBuilder client is running and you are logged in.
  • Verify that you have opened the code for your app in AppBuilder.
  • Verify that you have committed all pending changes.

Procedure

In-Browser

  1. In the top menu bar, select Version ControlBranches.
  2. (Optional) If you have configured third-party version control, click Refresh to fetch the state of the remote repository and all available remote branches.
  3. Select the branch into which you want to merge changes and click Checkout.
  4. Select the branch from which you want to merge changes and click Merge into Current.
    If this branch has a local and a remote counterpart, changes will be merged from the local branch.
  5. Confirm that you want to merge the branches.
  6. If prompted, resolve conflicts.
    1. In the sidebar, select Conflicts.
    2. Select a file and click Merge Tool.
    3. Inspect conflicts.
      The Local panel shows the version in the local branch into which you want to merge changes.
      The Base panel shows the base version of the file.
      The Remote panel shows the version in the branch from which you want to merge changes.
    4. (Optional) Manually edit the code in the Base panel.
    5. (Optional) Click the curved arrow icon between the Local and the Base panel to change the base file to the version in the local branch in which you want to merge changes.
    6. (Optional) Click the curved arrow icon between the Base and the Remote panel to change the base file to the version in the branch that you have selected to merge.
    7. (Optional) Click Save to save the changes to the code in the Base panel.
    8. (Optional) Click Reset to discard all changes to the code in the Base panel.
    9. Click Resolve to resolve to the version in the Base panel.
    10. Click Cancel to close the merge tool.
    11. In the sidebar, click Changes.
    12. Commit the modified file.
  7. (Optional) If you have configured third-party version control, return to the Branches tab and click Push to push the modified branch to the remote repository.

Universal

  1. In the top menu bar, select Version ControlBranches.
  2. (Optional) If you have configured third-party version control, click Refresh to fetch the state of the remote repository and all available remote branches.
  3. Select the branch into which you want to merge changes and click Checkout.
  4. Select the branch from which you want to merge changes and click Merge into Current.
    If this branch has a local and a remote counterpart, changes will be merged from the local branch.
  5. Confirm that you want to merge the branches.
  6. If prompted, resolve conflicts.
    1. In the sidebar, select Conflicts.
    2. Select a file and click Merge Tool.
    3. Inspect conflicts.
      The Local panel shows the version in the local branch into which you want to merge changes.
      The Base panel shows the base version of the file.
      The Remote panel shows the version in the branch from which you want to merge changes.
    4. (Optional) Manually edit the code in the Base panel.
    5. (Optional) Click the curved arrow icon between the Local and the Base panel to change the base file to the version in the local branch in which you want to merge changes.
    6. (Optional) Click the curved arrow icon between the Base and the Remote panel to change the base file to the version in the branch that you have selected to merge.
    7. (Optional) Click Save to save the changes to the code in the Base panel.
    8. (Optional) Click Reset to discard all changes to the code in the Base panel.
    9. Click Resolve to resolve to the version in the Base panel.
    10. Click Cancel to close the merge tool.
    11. In the sidebar, click Changes.
    12. Commit the modified file.
  7. (Optional) If you have configured third-party version control, return to the Branches tab and click Push to push the modified branch to the remote repository.

Windows

  1. In the top menu bar, select Version ControlBranches.
  2. (Optional) If you have configured third-party version control, click Refresh to fetch the state of the remote repository and all available remote branches.
  3. Select the branch into which you want to merge changes and click Checkout.
  4. Select the branch from which you want to merge changes and click Merge.
    If this branch has a local and a remote counterpart, changes will be merged from the local branch.
  5. If prompted, resolve conflicts.
    1. In the sidebar, select Conflicts.
    2. Select a file and click Merge Tool.
    3. Inspect conflicts.
      The Local File panel shows the version in the local branch into which you want to merge changes.
      The Base File panel shows the base version of the file.
      The Remote File panel shows the version in the branch from which you want to merge changes.
    4. (Optional) Manually edit the code in the Base panel.
    5. (Optional) Click Save to save the changes to the code in the Base File panel.
    6. (Optional) Click Reset to discard all changes to the code in the Base File panel.
    7. Click Resolve to resolve to the version in the Base File panel.
    8. Click X to close the merge tool.
    9. Click Changes.
    10. Commit the modified file.
  6. (Optional) If you have configured third-party version control, return to the Branches tab and click Push to push the modified branch to the remote repository.

Visual Studio

This operation is applicable to the in-browser client, the universal desktop client and the classic Windows desktop client. For information about version control in the extension for Visual Studio, see Use version control in Visual Studio.

CLI

This operation is applicable to the classic Windows desktop client and the in-browser client. With the command-line interface, you can use your preferred version control provider and tools.

Next Steps

If you no longer need the branch from which you merged changes, delete it.

See Also

Start a free trial Request a demo
Contact us: +1-888-365-2779
sales@telerik.com
Copyright © 2016-2017, Progress Software Corporation and/or its subsidiaries or affiliates. All rights reserved.