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

Re: using merge subtree and move it..

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Sep 9, 2008, 06:56 UTC
Message-ID
<48C61E1F.6000907@viscovery.net>
In-Reply-To
<ga4fho$5ib$1@ger.gmane.org>
SungHyun Nam schrieb:
> I used the subtree merge strategy. And then I moved the directory.
> Now, can I use subtree merge for that new directory?
Sure. It should work just fine.
Show 8 quoted lines
> $ git pull -s subtree klib master
> remote: Counting objects: 5, done.
> remote: Compressing objects: 100% (2/2), done.
> remote: Total 3 (delta 1), reused 0 (delta 0)
> Unpacking objects: 100% (3/3), done.
> From ssh://192.168.10.10/git/libs/klib
>  * branch            master     -> FETCH_HEAD
> error: Entry 'klib/klib.c' not uptodate. Cannot merge.

Your problem is not related to subtree merge. Make sure you have no changes to commit before you merge.

> fatal: merging of trees 31dd1721641a25bfb0225138a34c43483d870377 and
> bccba7da98b042817fdbd92c62b706919216b571 failed
> Merge with strategy subtree failed.
-- Hannes
Previous: SungHyun NamNext: SungHyun Nam
Message 2 of 4 in “using merge subtree and move it..”
  1. SungHyun NamSep 9, 2008
  2. Johannes SixtSep 9, 2008
  3. SungHyun NamSep 9, 2008
  4. Milos JakubicekNov 3, 2009

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.