On Wed, Dec 9, 2009 at 10:41 PM, Nils Adermann <naderman@xxxxxxxxxxx> wrote: > Following > http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html > I have subtree merged a 3rd party library (ezc-reflection) into my > repository (pflow). The prefix I used was lib/ezc/trunk/Reflection. Now > there have been changes to ezc-reflection but merging them into my > repository fails. The merge is attempted in example/ rather than > lib/ezc/trunk/Reflection. The auto-guessing feature of "merge -s subtree" doesn't always work. The 'pu' branch of git has some patches which allow you to use a command line like git merge -Xsubtree=lib/ezc/trunk/Reflection If you're nervous about using all of 'pu', try building git's 'master' after merging from commit 0354b06927a1220b696a5ee1004a8f061ba9b153. Eventually my git-subtree tool will use this automatically, but it's obviously not much use until the patches hit a released version of git. Hope this helps. Avery -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html