[IPython-dev] Pull request workflow...

[Fernando Perez]

On Sun, Oct 10, 2010 at 6:23 PM, Fernando Perez <fperez.net at gmail.com> wrote:
>
>
> Good question. The way I see it, feature branches proposed for
> inclusion should never be considered 'stable' in the sense of anyone
> following them and building on top of them.  In that case, the cleaner
> history for merge into trunk trumps other considerations, I think.
> The problem is that the merges lead to more than simple diamonds: they
> spread the history of the branch all over the place.

[...]

On this topic, the classic writeup is probably this about how the
process works in the Linux kernel:

http://kerneltrap.org/Linux/Git_Management

As you can see, I am proposing that the 'grunt' branches are rebased
(those for merge into trunk), but *never* that we'll rebase trunk
itself.  So when a 'manager' (to use Linus' lingo in that page)
rebases the branch he's about to push, he's just acting as a 'grunt',
he's not touching the trunk at all.

HTH,

f