From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Fri, 01 Jan 2010 00:05:42 GMT
Subject: Re: git pull -s subtree doesn't work properly
Message-ID: <20100101090542.6117@nanako3.lavabit.com>
In-Reply-To: <20091231193800.GB19537@cs-wsok.swansea.ac.uk>

Quoting Oliver Kullmann <O.Kullmann@swansea.ac.uk>

> it seems no reply yet (if I understand that web-email-interface
> properly); has nobody any idea here, or is it a Git bug,
> or my fault?

Because you don't specify where in your current directory hierarchy the root level of the tree you are merging goes when you run "git merge -s subtree", the merge mechanism has to find the most similar directory by itself, and if you have more than one similar directories, it can't guess correctly.

It sounds similar to

  http://thread.gmane.org/gmane.comp.version-control.git/135009/focus=135033

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/