[IPython-dev] Pull request workflow...

Brian Granger ellisonbg at gmail.com
Mon Oct 11 13:22:47 EDT 2010

> - When possible, rebase the branch you're about to merge into trunk
> before applying the merge.  If the rebase works, it will make the
> feature branch appear in all displays of the log that are
> topologically sorted as a contiguous set of commits, which makes it
> much nicer to look at and inspect later, as related changes are
> grouped together.

I think this is going a bit far.  As long as topic branches are clean
"coffee cup handles" I don't see why doing a --no-ff merge without
rebasing is that bad of thing.  I am not saying that rebasing is a bad
idea, but to always use it seems to miss the main point of using a
good DVCS: the ease of merging just about anything.



Brian E. Granger, Ph.D.
Assistant Professor of Physics
Cal Poly State University, San Luis Obispo
bgranger at calpoly.edu
ellisonbg at gmail.com

More information about the IPython-dev mailing list