你即將離開本站

並前往https://docs.github.com/cn/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

在GitHub 上解决合并冲突

您只能在GitHub 上解决由竞争行更改引起的合并冲突，例如当人们对Git 仓库中不同 ... ](/assets/images/help/pull_requests/view-merge-conflict-with-markers.png).

確定！ 回上一頁

查詢 「git merge conflict解決」的人也找了：

  1. Git merge conflict
    2.
  2. git merge conflict取消
    3.
  3. git取消merge
    4.
  4. Git merge --continue
    5.
  5. git衝突回避
    6.
  6. git merge用法
    7.
  7. git rebase conflict解決
    8.
  8. Git pull merge conflict
    9.