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. > $ 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
