无法解决 Azure DevOps 中的冲突
[英]Not able to resolve conflict in Azure DevOps
问题描述
Unable to merge the conflict in Azure Devops I have created the Pull Request from api_integration branch to development branch.
无法合并Azure Devops中的冲突 我创建了从api_integration分支到development分支的合并Pull Request 。 But there are some conflicts I can see but as my Complete button is disabled, not sure how to deal with code merging here.但是我可以看到一些冲突，但是由于我的“完成”按钮被禁用，所以不确定如何处理此处的代码合并。
I tried to switch to development branch in my android studio and pull the request but it says All files are up to date .我试图切换到我的 android 工作室的development分支并拉取请求，但它说All files are up to date 。
Not sure how to resolve this issue of PR with merge conflict.不确定如何通过合并冲突解决这个 PR 问题。
1 个解决方案
解决方案1
2 已采纳 2022-04-14 17:42:48
Basically you should resolve them locally with git commands, see tutorial here .基本上，您应该使用 git 命令在本地解决它们，请参阅此处的教程。
But - better way is to use the Pull Request Merge Conflict Extension for Azure DevOps.但是 - 更好的方法是为 Azure DevOps 使用Pull Request Merge Conflict Extension 。
After the installation you will have "conflicts" tab inside the PR:安装后，您将在 PR 中看到“冲突”选项卡：
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.