Git改编成master并进行推送而没有冲突 [英] Git rebase into master and push without conflict

问题描述

我已经使用rebase来将dev分支合并"到master中，而master可以正常工作.现在，master包含了我想要的dev分支中的所有内容.但是，现在我需要将其推到github上，这一直给我带来冲突.如何推送/同步到github并覆盖那里的所有文件?

I have used rebase to "merge" a dev branch into the master which works fine. Now the master contains everything from the dev branch which is what I want. However, now I need to push it to github which keeps giving me conflicts. How can I push/sync to github and overwrite all the files there as well?

推荐答案

如果在dev之上重新建立了master的基础，是的，master包含了dev分支中的所有内容"，但是它的历史记录已被重写(因此git push --force)

If you have rebased master on top of dev, yes, master "contains everything from the dev branch", but its history has been rewritten (hence the git push --force)

正确的顺序应该是:

• 在master顶部的第一个重播dev:

git checkout dev
git rebase master

然后将dev合并到master(快进合并)

Then merge dev to master (fast-forward merge)

git checkout master
git merge dev 

在这种情况下，可以将master推送到其远程上游存储库而不会发生冲突".

In that case, master could be pushed without "conflicts" to its remote upstream repo.

这篇关于Git改编成master并进行推送而没有冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！