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

Re: subtree merge tries to merge into wrong directory

From
Nils Adermann <naderman@naderman.de>
Date
Jan 2, 2010, 18:17 UTC
Message-ID
<4B3F8DAA.8090908@naderman.de>
In-Reply-To
<c10155f8a7a2dd451f0b74e323f3a989.squirrel@www.naderman.de>
naderman@naderman.de schrieb:
Show 5 quoted lines
> So I finally got around to trying this. This was my first result:
>
> $ git merge -Xsubtree=lib/ezc/trunk/Reflection/ FETCH_HEAD
> fatal: entry  not found in tree 60270661e0d2a5ee03b24609fac5c6d00d048988
>

Turns out that only happens because of the trailing slash. lib/ezc/trunk/Reflection works reliably.

Nils
Previous: naderman@naderman.de
Message 6 of 6 in “subtree merge tries to merge into wrong directory”
  1. Nils AdermannDec 10, 2009
  2. David AguilarDec 10, 2009
  3. Nils AdermannDec 10, 2009
  4. Avery PennarunDec 10, 2009
  5. naderman@naderman.deDec 16, 2009
  6. Nils AdermannJan 2, 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.