Azure DevOps解决拉取请求冲突 [英] Azure DevOps Resolve Pull Request Conflict

问题描述

因此，Azure有一个非常奇怪的问题. 在请求请求中，它正在检测一些冲突，但不显示它们在哪里以及我需要更改的内容. 在此之前，Visual Studio从.vs文件夹中拾取了很多垃圾，并且显示出与此冲突.

So, I have a very strange issue with Azure. In pull request, it is detecting some conflicts, but don't show up where they are, and what I need to change. Prior that, Visual Studio picked up a lot of junk from .vs folder, and there was shown conflicts with that.

因此，我删除了分支中的那些文件，现在只是空白窗口，通知存在冲突. 但是我看不到可以解决冲突的地方，就像在提交时在VS中一样，它打开了diff窗口来解决这些问题.在这里我什么都没看到. 我已尝试遵循本文，但没有帮助-

So, I deleted those files in the branch, and now it is just blank window informing, that there are conflicts. But I see no place, where I could resolve the conflicts, like in VS when committing, it opens up the diff window, to solve those. Here I see nothing. I have tried to follow this paper, but it didn't help - https://dzone.com/articles/git-operations-with-visual-studio-part-2#:~:text=Just%20click%20on%20the%20%22Conflicts,open%20the%20conflict%20resolving%20tool

我的错误- https://prnt.sc/u1qowm

推荐答案

在@Hugh Lin的建议下，我正在写我的问题的答案.因此，事实是，Azure DevOps实际上没有功能来合并或提交更改时处理冲突.

After a suggestion from @Hugh Lin I am writing answer to my problem. So, the thing is, that Azure DevOps does not really have a functionality to handle the conflicts when merging, or commit the changes.

在提交中，这并不是真正的问题，但是在拉取请求中，这是因为VS没有接口来解决这些冲突，并且其中许多人可能都被排除在这个问题之外.

In commits, it is not really a problem, but in pull requests, it is, because VS doesn't have a interface, to resolve those conflicts, and many of you may be left out there with this problem.

解决方案是将扩展安装到您的组织，称为-拉请求合并冲突扩展.它添加了新的标签--"Conflicts"在哪里可以解决他们

Solution to that, is to install the extension to your organization called - Pull Request Merge Conflict Extension. It adds new tab called - "Conflicts" where they could be solved

这篇关于Azure DevOps解决拉取请求冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！