[英]How to resolve merge conflicts with Azure Devops and Visual Studio 2019
I'm using Azure Devops and Visual Studio 2019 (v16.11.2).我正在使用 Azure Devops 和 Visual Studio 2019 (v16.11.2)。 Had to reset my laptop with a clean windows install and now I seem to be missing something here.不得不用干净的 Windows 安装重置我的笔记本电脑,现在我似乎在这里遗漏了一些东西。
I made several commits in a branch, now I want to merge back into master.我在一个分支中做了几个提交,现在我想合并回 master。 On Azure Devops I created a Pull Request, that has two merge conflicts.在 Azure Devops 上,我创建了一个拉取请求,它有两个合并冲突。 How do I resolve these?我该如何解决这些问题?
I can't find a button on Azure Devops web interface and I can't find anything with Pull Request in Visual Studio either where I use the 'Git Changes' pane (instead of Team Explorer).我在 Azure Devops Web 界面上找不到按钮,并且在 Visual Studio 中使用“Git 更改”窗格(而不是团队资源管理器)时也找不到任何带有拉取请求的内容。 Switching to master and pulling says 'Repository already up to date'切换到 master 并拉动说“存储库已经是最新的”
On Azure Devops I created a Pull Request, that has two merge conflicts.在 Azure Devops 上,我创建了一个拉取请求,它有两个合并冲突。 How do I resolve these?我该如何解决这些问题?
In Azure DevOps, there is no built-in feature can resolve the merge conflicts.在 Azure DevOps 中,没有内置功能可以解决合并冲突。
But we can use the Extension to achieve this feature in Azure DevOps: Pull Request Merge Conflict Extension但是我们可以在 Azure DevOps 中使用 Extension 来实现这个功能: Pull Request Merge Conflict Extension
This is a relatively convenient method.这是一种比较方便的方法。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.