![](/img/trans.png)
[英]How to solve "This branch has conflicts that must be resolved" using Rebase
[英]"This branch has conflicts that must be resolved" but it's already merged
您需要使用来自 master 的新提交更新您的分支,解决这些冲突并将更新/解决的分支推送到 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
2022 年更新
我在顶部使用了帮助,但我得到了一些 git 错误!
我认为是为了新的更新 git !
所以,我运行这个命令:
git checkout <branch>
喜欢: git checkout origin/main
git pull <repository link when you forked>
git checkout <branch>
git merge <branch>
现在去归档并检查您的更改!
git add
git commit
或者
git commit -m "commit"
如果您需要签署人:使用(-s)。
最后:
git push origin HEAD:<name-of-remote-branch>
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.