[IPython-dev] Pull request workflow...

Mark Voorhies mark.voorhies@ucsf....
Tue Oct 12 12:04:51 CDT 2010


On Tuesday, October 12, 2010 08:59:41 am Brian Granger wrote:
> >> I know some projects like to rebase absolutely everything to have a
> >> perfectly clean DAG. I don't feel like way and think the non-rebased
> >> merges of coffee cup handle branches is just fine.
> >
> > Those are valid points.  Let me try to clarify my perspective and why
> > I suggested the rebasing.  Compare the two screenshots:
> >
> > - http://imgur.com/nBZI2: merged branch where I rebased right before pushing
> > - http://imgur.com/7bNOy: merged branch (yellow) where I did NOT
> > rebase before pushing.
> >
> > I find the former much easier to follow than the latter, because all
> > related commits are topologically together.
> 
> Definitely, but I do agree with Hans that this is really a problem
> with the viewer, not the DAG itself.  But, I definitely agree with you
> that the rebased version is much cleaner.

FWIW, gitk's default topological sort groups the related commits in the
http://imgur.com/7bNOy example (see attached PNG, generated with
gitk --all)

--Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gitk.png
Type: image/png
Size: 30552 bytes
Desc: not available
Url : http://mail.scipy.org/pipermail/ipython-dev/attachments/20101012/92916f06/attachment-0001.png 


More information about the IPython-dev mailing list