[IPython-dev] Pull request workflow...

Brian Granger ellisonbg@gmail....
Mon Oct 11 12:22:47 CDT 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.

Cheers,

Brian

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


More information about the IPython-dev mailing list