TFS错误:必须完成合并才能完成请求请求 [英] TFS error: Merge must finish before the Pull Request can be completed

问题描述

我们在TFS中有一个PR，由于按钮为灰色/禁用，因此无法完成或放弃.悬停上的工具提示说:

We have a PR in TFS which cannot be completed or abandoned, because the button is grayed out/disabled. The tooltip on hover says:

必须在完成合并请求之前完成合并

Merge must finish before the Pull Request can be completed

正在进行合并... [放弃] [重新启动合并]

Merge in progress ... [Abandon] [Restart Merge]

屏幕截图(注意显示为灰色的按钮):

Screenshot (notice the grayed out button):

我们如何完成它? git中有未完成的合并吗?如果是这样，那么分支是如何首先被推入的?为什么至少不能放弃它?

How do we complete it? Is there an unfinished merge in git? If so, how was the branch pushed in the first place? And why can't it be Abandoned at least?

使用完整的错误文本进行搜索不会产生任何结果，它似乎还没有在互联网上的任何地方得到记录.

Googling with the full error text doesn't yield any results, it hasn't been documented anywhere on the internet it seems.

推荐答案

如果合并被阻止或卡住，则可以尝试单击三点菜单(...)转到完成"按钮，然后选择"重新启动合并"选项以开始新的合并作业.

If you have a merge that's blocked or stuck, you could try to click the triple-dot menu (...) next to the "Complete" button and choose the "Restart merge" option to start a new merge job.

根本原因是作业代理发生了磁盘空间不足而执行合并的问题.

The root cause was an issue with the job agents that perform merges running out of disk space.

如果上述方法无效，请尝试打开两个浏览器并删除源分支，然后放弃您的PR，然后撤消分支删除.您最终可以再次重新激活PR或创建一个新的PR.

If above is not work, also try to open two browsers and delete the source branch, then abandon your PR, then Undo the branch deletion. You could finally either reactivate the PR again or create a new one.

我们对此问题进行了公开的现场调查.有关更多信息，请参考以下内容:

We have a open live site investigation regarding this issue. Please refer to the following for more information:

Visual Studio Team Services上的请求请求问题-03/17 -已缓解

这篇关于TFS错误:必须完成合并才能完成请求请求的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！