Re: flatten-merge history

From: Christian Couder <christian.couder@gmail.com>
Date: Oct 26, 2014, 05:46 UTC
Message-ID: <CAP8UFD3jyZ+7bk-xrE=TghzFj9UL=+Mtz-CvFWK9azNrRcOU5Q@mail.gmail.com>
In-Reply-To: <544B9839.7000302@gmx.de>

Hi,

On Sat, Oct 25, 2014 at 2:31 PM, Henning Moll <newsScott@gmx.de> wrote:

Show 31 quoted lines

> Hi,
>
> suppose the following history
>
>     P - - - Q - - - - - R       <-extern
>
> A -- - B - - - C - D - - - E   <-master
>           \           \
>           M ...       \         <-b1
>                           \
>                           W ...   <-b2
>
>
> Note that master and extern do not have a common parent. Both histories are
> 'distinct', they do not share common files, so there can't be any merge
> conflicts. What i want to achieve is this history:
>
>     P - - - Q - - - - - R       <-extern
>
> A -P'- B'- Q'- C'- D'- R'- E'  <-master
>             \           \
>             M'...       \         <-b1
>                             \
>                             W'...   <-b2
>
> The two histories should be merged in chronological order.
> So while master reflects P-Q-R, b2 should only reflect P-Q and b1 should
> only reflect P.
>
> All my current attempts (surgery with git replace or interactive rebase
> combined with merging) were not successfull.

Could you tell us why interactive rebase did not work? If there can't be any merge conflict between both histories, it should have worked without asking you to resolve any conflict.

Best, Christian.