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屋！