Re: More help needed on merging unrelated repos
- From
Christian MICHON <christian.michon@gmail.com>
- Date
- Nov 4, 2008, 21:08 UTC
- Message-ID
- <46d6db660811041308o19f1131dm4d49b6703fa6d22b@mail.gmail.com>
- In-Reply-To
- <4910ACCA.7080007@op5.se>
Andreas Ericsson wrote:
Show 36 quoted lines
> Christian MICHON wrote: >> >> Hi, >> >> I previously posted here a question on how to merge unrelated repos, >> and I was quite happy with the answer. >> git pull repo_name repo_branch >> >> Yet, when I merge these repos (they're unrelated), I'd like to merge >> all of them at once. >> >> How do I pull for example 2 repos in 1 command ? I cannot figure out >> the exact syntax to use. >> >> I tried: >> git pull ../i1 0.5 ../i2 master >> git pull ../i1 0.5 -- ../i2 master >> >> I also tried to play with --no-commit and -s to no avail. >> >> Does anyone of you already use this and knows the trick ? Thanks in >> advance! >> > > You can only pull from a single repository at a time. The first way of doing > what you want that comes to mind is: > > git remote add lib1 lib1url > git remote add lib2 lib2url > git fetch lib1 && git fetch lib2 && git merge lib1/master lib2/master > > -- > Andreas Ericsson andreas.ericsson@op5.se > OP5 AB www.op5.se > Tel: +46 8-230225 Fax: +46 8-230231 >
and apparently this strategy (which I tried before too :( ) fails when merging.
example: repo i1 contains file 'a' repo i2 contains file 'b' new repo z contains file 'readme' and I want to pull repo i1 and i2 at the same time inside repo z.
typically, I've to pull 1 repo at a time, if I use pull. If I fetch both without merge, and then I try a merge, it fails. maybe I'm on a wild goose chase after all.
thanks
-- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !