Re: Heads up: major rebase -i -p rework coming up

From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Jan 27, 2009, 22:10 UTC
Message-ID: <20090128071054.6117@nanako3.lavabit.com>
In-Reply-To: <20090127092117.d13f24e7.stephen@exigencecorp.com>

Quoting Stephen Haberman <stephen@exigencecorp.com>:

Show 12 quoted lines

> My primary pain point with rebase-i-p has been rebasing a branch that
> has merged in another branch that has a lot of commits on it. E.g.:
>
>     a -- b -- c  origin/feature
>       \
>        d -- e    feature
>            /
>       ... g      origin/master
>
> Where e is merging in, say, a latest release that had a few hundred
> commits in the master branch. After resolving conflicts/etc. in e, I
> want to rebase d..e from a to be on c.

Sorry for asking a basic question, but if "feature" is a topic branch for advance the feature, why are you merging origin/master into it? Doesn't it blur the theme of the branch by including "development of the feature and all the random things that happened while it was being developed in other places"?

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/