Git: Subtree Merge into a Deeply Nested Subdirectory?

Question

I\'m attempting to use git\'s subtree merge stategy where the subdirectory into which I want to merge is nested fairly deeply - currently four levels deep.

I followed th

Answer 1

The subtree merge strategy artificially limits the depth of its search for where the subtree “fits” into the overall tree. Unfortunately this limit is hard coded (see match-trees.c:267).

Luckily, Git 1.7.0 added the subtree=… option to the (default) recursive merge strategy. This option lets you exactly specify the prefix so that Git does not have to guess (as much).

With Git 1.7.0 or later, try this:

git pull -X subtree=sites/all/modules/my_module REMOTE_REPO master