通過合併固定:
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