From: Nanako Shiraishi <nanako3@lavabit.com>
To: Oliver Kullmann <O.Kullmann@swansea.ac.uk>
Cc: git@vger.kernel.org
Subject: Re: git pull -s subtree doesn't work properly
Date: Fri, 01 Jan 2010 09:05:42 +0900 [thread overview]
Message-ID: <20100101090542.6117@nanako3.lavabit.com> (raw)
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/
prev parent reply other threads:[~2010-01-01 0:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-05 18:09 git pull -s subtree doesn't work properly Oliver Kullmann
2009-12-31 19:38 ` Oliver Kullmann
2009-12-31 20:37 ` Oliver Kullmann
2010-01-01 0:05 ` Nanako Shiraishi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100101090542.6117@nanako3.lavabit.com \
--to=nanako3@lavabit.com \
--cc=O.Kullmann@swansea.ac.uk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox