通过合并固定:
git fetch origin # gets latest changes made to master
git checkout feature # switch to your feature branch
git merge master # merge with master
# resolve any merge conflicts here
git push origin feature # push branch and update the pull request
通过底垫固定:
git fetch origin # gets latest changes made to master
git checkout feature # switch to your feature branch
git rebase master # rebase your branch on master
# complete the rebase, fix merge conflicts, etc.
git push --force origin feature
仔细注意,作为底垫有效地重写大概需要重订后--force
选项上推feature
分支。这意味着您需要通过强制推送来覆盖GitHub中的旧分支。
无论您是进行合并还是重新绑定,之后都应该解决冲突,并且您的审阅者应该能够完成请求。
您需要在本地合并或重新绑定并推送结果。 – CollinD