Re: how do I merge completely unrelated repositories ?
- From
Christian MICHON <christian.michon@gmail.com>
- Date
- Jun 26, 2008, 10:51 UTC
- Message-ID
- <46d6db660806260351w6082b5f9q6db3ef62552fafc4@mail.gmail.com>
- In-Reply-To
- <20080626094522.GA29404@genesis.frugalware.org>
On Thu, Jun 26, 2008 at 11:45 AM, Miklos Vajna <vmiklos@frugalware.org> wrote:
Show 5 quoted lines
> On Thu, Jun 26, 2008 at 11:39:37AM +0200, Christian MICHON <christian.michon@gmail.com> wrote: >> How would you do it, since merge will not merge if it cannot find a >> common ancestor ? > > Did you try so?
yes I did. it was failing.
> > If there are no conflicting paths then a simple > > git pull /path/to/other/repo.git master
pull = fetch + merge
maybe I was not fetching the objects properly.
> > or similar should work. >
your hint works fine. thanks!
I was starting considering rebasing the 2 repos on a common empty commit (that would have been desperate)...
-- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !