如何用实验分支替换主分支 [英] How to replace master branch with experiment branch

问题描述

我有两个分支：主人和实验。他们两人分开演变，现在非常不同。现在我准备好让实验分支成为我的主分支。

如果我尝试

  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 experiment

I 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 experiment

If these are public branches, you'll probably want to merge and resolve conflicts, as Jefromi explains.

这篇关于如何用实验分支替换主分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！