git - 如何在 Git 中 merge 子目录？

Question

是否可以仅将本地 Git 分支的子目录更改 merge 到远程 Git 分支，还是“全有或全无”？

例如，我有:

branch-a
 - content-1
 - dir-1
   - content-2

和

branch-b
 - content-1
 - dir-1
   - `content-2

我只想将 branch-a dir-1 的内容与 branch-b dir-1 的内容 merge 。

Answer 1

作为 SO 问题“How do you merge selective files with git-merge?”的替代方案，我刚刚找到了this GitHub thread这可能更适合 merge 整个子目录，基于 git read-tree :

• My repository => cookbooks
  My repository target directory => cookbooks/cassandra

• Remote repository => infochimps
  Remote repository source I want merged into cookbooks/cassandra => infochimps/cookbooks/cassandra

Here are the commands I used to merge them

• Add the repository and fetch it

  git remote add -f infochimps git://github.com/infochimps cluster_chef.git
  

• Perform the merge

  git merge --allow-unrelated-histories -s ours --no-commit infochimps/master
  

(this performs a merge by using the 'ours' strategy (-s ours), which discards changes from the source branch.
This records the fact that infochimps/master has been merged, without actually modifying any file in the target branch)

• Merge only infochimps/cookbooks/cassandra into cassandra

  git read-tree --prefix=cassandra/ -u infochimps/master:cookbooks/cassandra
  

This reads the tree for only the required source subdirectory i.e. cookbooks/cassandra, on the upstream branch of the source repository.

Note that the target subdirectory name should also be cookbooks/cassandra, or you would see:

fatal: Not a valid object name

• Commit the change

  git commit -m 'merging in infochimps cassandra'
  

---

附录

这很奇怪，^{[edit me]} — 但是 read-tree 这一步可能会像这样失败:

error: Entry 'infochimps/cookbooks/cassandra/README' overlaps with 'cookbooks/cassandra/README'. Cannot bind.

...即使两个文件相同。这可能会有所帮助:

git rm -r cassandra
git read-tree --prefix=cassandra/ -u infochimps/master:cookbooks/cassandra

当然，手动验证这是否符合您的要求。