This troubleshooting tutorial is intended for developers who are using third-party version control. You will learn:
- How to reset the local AppBuilder repository
- How to restore changes from the third-party Git repository
You can no longer pull changes from the remote Git repository. When you attempt to pull changes, you receive the following message:
Cannot pull into a repository with state: MERGING_RESOLVED
The state of your local AppBuilder repository was set to MERGING_RESOLVED as a result of a version control operation. This state limits pull operations and you cannot pull changes from the remote Git repository.
You need to perform a hard reset on the private repository. A hard reset operation resets both the state and the version control history of the local AppBuilder repository. For more information, see Resetting the AppBuilder Repository.
First, verify that AppBuilder is running, you are logged in and you have opened your app.
Next, in the main menu, click Version Control → History. Select the commit that is on the top of the list.
Selecting your latest commit ensures that you will only reset the state of the remote repository and you will not lose any committed changes. Keep in mind that all unsaved and uncommitted changes in the solution will be lost.
Click Reset and from the pop-up window, select Hard reset.
Keep in mind that any commits made between resetting the private repository and pulling from the remote repository might cause conflicts.