'Pulling and Resolving PR conflicts from AzDO
My company uses Azure DevOps for source control. For the most part it works just like GitHub, but I can't figure out how to do this one scenario. Another co-worker has raised a PR but there are conflicts in his PR. How can I pull down the PR and resolve the conflicts locally. Yes, he should do that, but he's going to be out for awhile. I want to be able to see the conflict markers locally and resolve them in VSCode.
I've tried this command locally: git fetch origin pull/27561/head:fixpr
but that just returns: fatal: couldn't find remote ref pull/27561/head
githubSolution 1:[1]
As far as I know, there is no such method could pull down the PR to your local machine directly.
If you want to resolve the conflicts on your local machine, you need to clone the repo, then do a git pull locally to find out the conflicting files.
Finally you can change the file and push to Azure Repo.
Refer to this official doc to get the detailed steps: Resolve merge conflicts
On the other hand, you can also consider using this extension: Pull Request Merge Conflict Extension to resolve conflicts directly in Azure DevOps Pull Requests.
You can see the Conflicts tab in the Pull Request.
For example:
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|---|
| Solution 1 | Kevin Lu-MSFT |