"This branch has conflicts that must be resolved" 但它已经合并
"This branch has conflicts that must be resolved" but it's already merged
我合并了一个PR with the GitHub web interface, which resolved in a successful merge commit。
之后，GitHub 抱怨这个分支有必须解决的冲突。有谁知道为什么或如何获得状态 merged?
您需要使用 master 的新提交更新您的分支，解决这些冲突并将 updated/resolved 分支推送到 GitHub。
git checkout master
git pull
git checkout <branch>
git merge master
[ ... resolve any conflicts ... ]
git add [files that were conflicted]
git commit
git push
我合并了一个PR with the GitHub web interface, which resolved in a successful merge commit。
之后，GitHub 抱怨这个分支有必须解决的冲突。有谁知道为什么或如何获得状态 merged?
您需要使用 master 的新提交更新您的分支，解决这些冲突并将 updated/resolved 分支推送到 GitHub。
git checkout master
git pull
git checkout <branch>
git merge master
[ ... resolve any conflicts ... ]
git add [files that were conflicted]
git commit
git push