[IPython-dev] Pull request workflow...
fperez.net at gmail.com
Sun Oct 10 18:47:50 EDT 2010
On Sun, Oct 10, 2010 at 3:32 PM, Fernando Perez <fperez.net at gmail.com> wrote:
> - When possible, rebase the branch you're about to merge into trunk
> before applying the merge.
Oh, and I should add: if you rebase and it works, when you merge into
trunk to apply, make sure you merge with '--no-ff', so that we get a
standalone branch grouping the related commits together. Otherwise
the rebase will allow git to fast-forward, losing the logical grouping
More information about the IPython-dev