Progress will discontinue Telerik Platform on May 10th, 2018. Learn more

Resolve Conflicts

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.

When you use third-party version control, you might need to synchronize your local version of the app with the remote repository. When you pull or push your changes to the remote repository, you might be prompted that AppBuilder cannot merge changes automatically. In this case, you need to resolve conflicts locally.

AppBuilder indicates conflicting changes with the ! icon in the Project Navigator.

Prerequisites

  • Verify that your preferred AppBuilder client is running and you are logged in.
  • Verify that you have opened the code for your app.
  • Verify that you have pulled the latest changes from the remote repository.
  • If you want to resolve conflicts from merging branches, see Merge Branches.

Procedure

In-Browser

If you want to resolve conflicts from merging branches, see Merge Branches.

You can apply any of the following approaches to resolve conflicts in the in-browser client.

  • Quickly resolve conflicts.
    1. In the Project Navigator, right-click the file with the ! icon.
    2. From the context menu, select Version ControlConflicts.
    3. Click Resolve and select how to resolve the conflicts.
      Option Description
      Resolve to local version Preserves the local version.
      Resolve to remote version Overwrites the local version with the changes from the remote repository.
      Resolve to workspace version Preserves the current version of the app. It might contain information about the conflicts. This information is indicated by lines of code starting with <<<<<<<, ======= and >>>>>>>.
    4. In the title bar, click your app name to return to your code.
  • Resolve conflicts in the app.
    1. In the Project Navigator, double-click the file with the ! icon.
    2. Edit the contents of the file.
    3. Verify that you have removed the lines starting with <<<<<<<, ======= and >>>>>>>.
    4. In the Project Navigator, right-click the file with the ! icon.
    5. From the context menu, select Version ControlConflicts.
    6. Click ResolveResolve to workspace version.
  • Resolve conflicts with the merge tool.
    1. In the Project Navigator, click the ! icon and select Conflicts.
    2. Click Merge Tool.
    3. (Optional) Edit the code in the Base panel.
    4. (Optional) Click Save to save the changes to the code in the Base panel.
    5. (Optional) Click Reset to discard all changes to the code in the Base panel.
    6. Click Resolve to resolve to the version in the Base panel.

Universal

If you want to resolve conflicts from merging branches, see Merge Branches.

You can apply any of the following approaches to resolve conflicts in the universal desktop client.

  • Quickly resolve conflicts.
    1. In the Project Navigator, right-click the file with the ! icon.
    2. From the context menu, select Version ControlConflicts.
    3. Click Resolve and select how to resolve the conflicts.
      Option Description
      Resolve to local version Preserves the local version.
      Resolve to remote version Overwrites the local version with the changes from the remote repository.
      Resolve to workspace version Preserves the current version of the app. It might contain information about the conflicts. This information is indicated by lines of code starting with <<<<<<<, ======= and >>>>>>>.
    4. In the title bar, click your app name to return to your app.
  • Resolve conflicts in the app.
    1. In the Project Navigator, double-click the file with the ! icon.
    2. Edit the contents of the file.
    3. Verify that you have removed the lines starting with <<<<<<<, ======= and >>>>>>>.
    4. In the Project Navigator, right-click the file with the ! icon.
    5. From the context menu, select Version ControlConflicts.
    6. Click ResolveResolve to workspace version.
  • Resolve conflicts with the merge tool.
    1. In the Project Navigator, click the ! icon and select Conflicts.
    2. Click Merge Tool.
    3. (Optional) Edit the code in the Base panel.
    4. (Optional) Click Save to save the changes to the code in the Base panel.
    5. (Optional) Click Reset to discard all changes to the code in the Base panel.
    6. Click Resolve to resolve to the version in the Base panel.

Windows

If you want to resolve conflicts from merging branches, see Merge Branches.

You can apply any of the following approaches to resolve conflicts in the classic Windows desktop client.

  • Quickly resolve conflicts.
    1. In the Project Navigator, click the ! icon and select Conflicts.
    2. Click Resolve and select how to resolve the conflicts.
      Option Description
      Resolve to local version (top) Preserves the local version.
      Resolve to remote version Overwrites the local version with the changes from the remote repository.
      Resolve to local version (bottom) Preserves the current version of the app. It might contain information about the conflicts. This information is indicated by lines of code starting with <<<<<<<, ======= and >>>>>>>.
    3. Click X to close the Version Control dialog and return to your app.
  • Resolve conflicts in the app.
    1. In the Project Navigator, double-click the file with the ! icon.
    2. Edit the contents of the file.
    3. Verify that you have removed the lines starting with <<<<<<<, ======= and >>>>>>>.
    4. In the Project Navigator, click the ! icon and select Conflicts.
    5. Click ResolveResolve to local version at the bottom of the drop-down menu.
  • Resolve conflicts with the merge tool.
    1. In the Project Navigator, click the ! icon and select Conflicts.
    2. Click Merge Tool.
    3. (Optional) Edit the code in the Base File panel.
    4. (Optional) Click Save to save the changes to the code in the Base File panel.
    5. (Optional) Click Reset to discard all changes to the code in the Base File panel.
    6. Click Resolve to resolve to the version in the Base File panel.
    7. Click X to close the merge tool.
    8. Click X to close the Version Control dialog and return to your app.

Visual Studio

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

Commit and push the changes.

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.