Study
Reputation: 193
1 merge conflict azure devops. How resolve?
I pulled request from branch feat/02-authentication-azure-ad into develop and had 1 merge conflict in package-lock.json file. What is the reason for this conflict and how to resolve it? Help me please!!!
Upvotes: 1
Views: 1140
Answers (1)
Kim Xu-MSFT
Reputation: 2216
You could install this Extension: https://marketplace.visualstudio.com/items?itemName=ms-devlabs.conflicts-tab&targetId=ca4e4e67-3099-4c62-9ea9-bef80e0cc70a&utm_source=vstsproduct&utm_medium=ExtHubManageList
This will allow you to review and modify the merge conflicts on the PR page.
Upvotes: 2
Related Questions
- How do I resolve a pull request merge conflict in Azure Dev Ops?
- How to resolve merge conflict in pull request in VSTS?
- How to resolve merge conflicts with Azure Devops and Visual Studio 2019
- Not able to resolve conflict in Azure DevOps
- Git merge conflicts during PRs
- Azure DevOps Resolve Pull Request Conflict
- Resolve merge conflicts GIT Azure-devops Server Side
- Resolve PR Conflict in Azure DevOps without changing source branch
- How to resolve merge conflict during pull request?
- Git Merge Workflow