Git的子树合并策略没有选择正确的目录

Question

I have a repository that looks something like this:

foo/
    subrepo/
        a_file_in_subrepo
        another.ext
    unrelated_file

subrepo is a repository on github, and I have a remote in my repository, say sub , that tracks it, but none of the files are merged.

What I want is to merge in sub/master at the subrepo folder. I know that a_file_in_subrepo and another.ext are exactly as they are in sub/master but if I run git merge -s subtree sub/master I don't get what I want, and instead get:

foo/
    subrepo/
        a_file_in_subrepo
        another.ext
    unrelated_file
    a_file_in_subrepo
    another.ext

I'm really confused. I know it guesses the directory to merge into automagically, can I override that?

Answer 1

使用-Xsubtree=<path>选项进行recursive合并策略：

git merge -s recursive -Xsubtree=subrepo sub/master