I'm reviving an old thread here as this result comes up in Google when doing a search for this specific problem, and this thread never addressed the solution to the problem.
I'm following the subtree merge strategy at https://help.github.com/articles/working-with-subtree-merge and have ran into a complication. When someone clones a repository with a subtree-merged remote in it, do they need to set it up again? It seems that the remote point does not also get cloned. I tried replicating the steps after working, but I'm getting a "error: Entry 'blah' overlaps with 'blah'. Cannot bind." when doing the read-tree command. I'm stuck at that point. $ git clone [email protected]:Mudlet/Mudlet.git Github-Mudlet Cloning into 'Github-Mudlet'... remote: Counting objects: 9639, done. remote: Compressing objects: 100% (2212/2212), done. remote: Total 9639 (delta 7001), reused 9603 (delta 6965) Receiving objects: 100% (9639/9639), 14.92 MiB | 165 KiB/s, done. Resolving deltas: 100% (7001/7001), done. $ cd Github-Mudlet/ Github-Mudlet-(git/ master )$ git pull -s subtree mudlet-lua master fatal: 'mudlet-lua' does not appear to be a git repository fatal: The remote end hung up unexpectedly Github-Mudlet-(git/ master )$ git remote add -f mudlet-lua [email protected]:vadi2/mudlet-lua.git Updating mudlet-lua remote: Counting objects: 7, done. remote: Compressing objects: 100% (1/1), done. remote: Total 4 (delta 3), reused 4 (delta 3) Unpacking objects: 100% (4/4), done. >From github.com:vadi2/mudlet-lua * [new branch] master -> mudlet-lua/master Github-Mudlet-(git/ master )$ git merge -s ours --no-commit mudlet-lua/master Automatic merge went well; stopped before committing as requested Github-Mudlet-(git/ master )$ git read-tree --prefix=src/mudlet-lua/ -u mudlet-lua/master error: Entry 'src/mudlet-lua/.travis.yml' overlaps with 'src/mudlet-lua/.travis.yml'. Cannot bind. What is the proper way to resolve this and get git pull -s subtree to work again? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
