All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: Henning Moll <newsScott@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: flatten-merge history
Date: Sun, 26 Oct 2014 06:46:41 +0100	[thread overview]
Message-ID: <CAP8UFD3jyZ+7bk-xrE=TghzFj9UL=+Mtz-CvFWK9azNrRcOU5Q@mail.gmail.com> (raw)
In-Reply-To: <544B9839.7000302@gmx.de>

Hi,

On Sat, Oct 25, 2014 at 2:31 PM, Henning Moll <newsScott@gmx.de> wrote:
> 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.

  reply	other threads:[~2014-10-26  5:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-25 12:31 flatten-merge history Henning Moll
2014-10-26  5:46 ` Christian Couder [this message]
2014-10-26 14:36   ` Henning Moll
2014-10-26 15:19     ` Andreas Schwab
2014-10-26 19:02       ` Christian Couder
2014-10-26 23:45         ` Henning Moll
2014-10-27 18:45           ` Andreas Schwab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAP8UFD3jyZ+7bk-xrE=TghzFj9UL=+Mtz-CvFWK9azNrRcOU5Q@mail.gmail.com' \
    --to=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newsScott@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.