I’ve noticed something interesting happening in Visual Studio 15 when I move between environments and try to do a pull request.
I’m able to see the incoming commits queue as well as the content within them but when I go to do a pull request I’ll receive the error:
An error occurred. Detailed message: 1 conflict prevents checkout
Although this is usually quite an easy problem to resolve for some reason Visual Studio isn’t showing the diff tool and allowing me to resolve the conflicts.
Thankfully as we’re using git for our version control backend this is quite easy to resolve in the backend.
To overcome this first open a new command line window for the repository where the conflict is.
First navigate to the synchronization page which shows you incoming and outgoing commits. In the window that appears click Actions and then Open in Command Prompt.
You then want to perform a
git status command to confirm that you have outstanding changes to pull from the current branch.
And then do a
git pull to manually pulldown the latest version of the branch to your local repository. In order to do successfully perform a pull request you will also need to enter alternative access credentials. If you don’t already have these (or know them) then logging into your Visual Studio Online page, managing your profile (top right) and setting them on Security will create the credentials you need whenever using git from the console window.