如果我尝试
git checkout master git合并实验我得到吨和吨的错误。
让实验分支成为主人而不丢失所有实验分支历史的最简单方法是什么？
我已经创建了master分支的备份，像这样发布1.0
git checkout master git checkout -b release_1解决方案
假设这些是 private 分支（即没有其他人正在处理它们），你可以像这样设置 master 到实验 p>
git checkout master git reset --hard experiment如果这些是公共分支，您可能会想要合并和解决冲突，如 Jefromi解释。
I have two branches: master and experiment. Both of them evolved separately and are very different now. Now I am ready to make experiment branch my master branch.
If I try
git checkout master git merge experimentI get tons and tons of error.
What is the easiest way to get experiment branch to become master without loosing all the history of experiment branch.
I have already created a backup of master branch as release 1.0 like this
git checkout master git checkout -b release_1解决方案
Assuming these are private branches (i.e. nobody else is working on them), you can just set master to experiment like this:
git checkout master git reset --hard experimentIf these are public branches, you'll probably want to merge and resolve conflicts, as Jefromi explains.
更多推荐
如何用实验分支替换主分支
发布评论