合并两个git仓库

为了让大家看的明白，我重新描述下case如下：

1. 有2个git仓库：repo1、repo2；
2. 想将repo1中的文件移入repo2；
3. repo1的历史日志要保留；

首先，快速创建2个仓库。

1 2 3 4 5 6 7 8 9 10 11 12 13

<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>mkdir</strong></span> repo1 <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>cd</strong></span> repo1 <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git init</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>echo</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(255, 0, 0);">"repo1.txt"</span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>></strong></span> repo1.txt <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git add</strong></span> repo1.txt <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git</strong></span> ci <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 0, 51);">-m</span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(255, 0, 0);">"init repo1"</span>   <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>mkdir</strong></span> repo2 <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>cd</strong></span> repo2 <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git init</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>echo</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(255, 0, 0);">"repo2.txt"</span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>></strong></span> repo2.txt <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git add</strong></span> repo2.txt <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git</strong></span> ci <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 0, 51);">-m</span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(255, 0, 0);">"init repo2"</span>

结果目录路径是：

1 2 3 4 5 6 7

repo1<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span> repo1<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>repo1.txt repo1<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>.git   repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span> repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>repo2.txt repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>.git

再次注意，想要的效果是：

1 2 3 4

repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span> repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>repo1.txt repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>repo2.txt repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>.git

然后，需要五步命令：

1 2

<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 102, 102);"><em># 1、将repo1作为远程仓库，添加到repo2中，设置别名为other</em></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>[</strong></span>jot<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>@</strong></span>myhost repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>]</strong></span>$ <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git remote</strong></span> add other ..<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>repo1<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>

1 2 3 4 5 6 7 8

<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 102, 102);"><em># 2、从repo1仓库中抓取数据到本仓库</em></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>[</strong></span>jot<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>@</strong></span>myhost repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>]</strong></span>$ <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git fetch</strong></span> other warning: no common commits remote: Counting objects: <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">3</span>, done. remote: Total <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">3</span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>(</strong></span>delta <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">0</span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>)</strong></span>, reused <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">0</span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>(</strong></span>delta <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">0</span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>)</strong></span> Unpacking objects: <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">100</span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>%</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>(</strong></span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">3</span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">3</span><span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>)</strong></span>, done. From ..<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>repo1 <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>*</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>[</strong></span>new branch<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>]</strong></span> master -<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>></strong></span> other<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>master

1 2 3 4

<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 102, 102);"><em># 3、将repo1仓库抓去的master分支作为新分支checkout到本地，新分支名设定为repo1</em></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>[</strong></span>jot<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>@</strong></span>myhost repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>]</strong></span>$ <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git checkout</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 0, 51);">-b</span> repo1 other<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>/</strong></span>master Branch repo1 <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>set</strong></span> up to track remote branch master from other. Switched to a new branch <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(255, 0, 0);">'repo1'</span>

1 2 3

<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 102, 102);"><em># 4、切换回repo2的master分支</em></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>[</strong></span>jot<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>@</strong></span>myhost repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>]</strong></span>$ <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git checkout</strong></span> master Switched to branch <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(255, 0, 0);">'master'</span>

1 2 3 4 5 6

<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(102, 102, 102);"><em># 5、将repo1合并入master分支</em></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>[</strong></span>jot<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>@</strong></span>myhost repo2<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>]</strong></span>$ <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(194, 12, 185);"><strong>git merge</strong></span> repo1 Merge made by recursive. repo1.txt <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;"><strong>|</strong></span> <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">1</span> + <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">1</span> files changed, <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">1</span> insertions<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>(</strong></span>+<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>)</strong></span>, <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">0</span> deletions<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>(</strong></span>-<span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline; color: rgb(122, 8, 116);"><strong>)</strong></span> create mode <span style="margin: 0px; padding: 0px; border: 0px; vertical-align: baseline;">100644</span> repo1.txt

可以看到效果了，日志确实还在：

已经完成，可以push到服务器了。

可能遇到的问题：

1. 在合并时有可能两个分支对同一个文件都做了修改，这时需要解决冲突，对文本文件来说很简单，根据需要对冲突的位置进行处理就可以。对于二进制文件，需要用到如下命令。

git checkout --theirs YOUR_BINARY_FILES     // 保留需要合并进来的分支的修改

//git checkout --ours YOUR_BINARY_FILES       // 保留自己的修改

git add YOUR_BINARY_FILES

git comm

总结：

1. 大致思路是伪造远程的repo1仓库为repo2的一个分支，然后合并进来；
2. 若是文件有冲突、或要建立子目录，建议在repo1中先解决，再进行如上操作。