# 合并、关闭拉取请求

在 GitHub 上有效地合并、回退和关闭拉取请求，解决合并冲突，并排查状态检查问题。

## Links

* [Resolving a merge conflict on GitHub](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/resolving-a-merge-conflict-on-github)

  Resolve simple merge conflicts directly on GitHub using the conflict editor or handle complex cases via the command line.

* [Resolving a merge conflict using the command line](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/resolving-a-merge-conflict-using-the-command-line)

  Resolve merge conflicts using the command line by identifying conflicting changes, editing files, and committing resolutions.

* [必需状态检查故障排除](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/troubleshooting-required-status-checks)

  通过排查必需的状态检查，解决常见错误，并解除合并或推送到受保护分支时的阻碍。

* [Merging a pull request](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/merging-a-pull-request)

  Merge pull requests into the upstream branch, choose merge methods, and meet repository requirements like reviews or status checks.

* [将拉取请求与合并队列合并](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/merging-a-pull-request-with-a-merge-queue)

  在 GitHub 中使用合并队列，简化拉取请求的合并流程，确保必要检查通过，并有效管理队列操作。

* [自动合并拉取请求](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/automatically-merging-a-pull-request)

  启用或禁用拉取请求的自动合并，以简化工作流，并在满足所有要求后自动合并更改。

* [还原拉取请求](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/reverting-a-pull-request)

  创建一个新的拉取请求，以撤销先前已合并的拉取请求，并处理可能出现的合并冲突。

* [关闭拉取请求](/zh/enterprise-server@3.17/pull-requests/how-tos/merge-and-close-pull-requests/closing-a-pull-request)

  关闭拉取请求，无需合并即可管理不必要的更改或解决其他分支中的替代解决方案。