Hello,
I used the subtree merge strategy. And then I moved the directory.
Now, can I use subtree merge for that new directory?
I just tried 'read-tree'.. (klib was in 'libs/klib').
$ git read-tree --prefix=klib/ -u klib/master
error: Entry 'klib/Makefile' overlaps with 'klib/Makefile'. Cannot bind.
Hmm.. just tried subtree merge..
$ 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.
fatal: merging of trees 31dd1721641a25bfb0225138a34c43483d870377 and
bccba7da98b042817fdbd92c62b706919216b571 failed
Merge with strategy subtree failed.
Thanks,
namsh
--
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
