Subject: Re: Git: Having trouble merging two repositories by interweaving their histories

From: Andreas Schwab <[email-masked]>
Date: Tue, 10 Sep 2013 01:06:49 +0200

THILLOSEN Andreas <[email-masked]> writes:

> It implies "interweaving" their histories, so that I can get a "state"
> of both RepA and RepB around a same time period of time.

This is only possible by rewriting every commit to point to a new tree
containing the combined trees of the two repositories.  To get a
meaningful result this requires that both repositories have a completely
linear history.

Andreas.

-- 
Andreas Schwab, [email-masked]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."