git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git pull -s subtree doesn't work properly

From
Nanako Shiraishi <nanako3@lavabit.com>
Date
Jan 1, 2010, 00:05 UTC
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/
Previous: Oliver Kullmann
Message 4 of 4 in “git pull -s subtree doesn't work properly”
  1. Oliver KullmannNov 5, 2009
  2. Oliver KullmannDec 31, 2009
  3. Oliver KullmannDec 31, 2009
  4. Nanako ShiraishiJan 1, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.