On Fri, Mar 2, 2012 at 1:06 AM, Robert Bradshaw <rober...@math.washington.edu> wrote: > Though for a single commit, a rebase is cleaner IMHO than a merge, and > squashing commits improves the signal-to-noise ratio of the history > (and it's nice to be able to squash away stuff like typos).
That was my original position, but I recently changed my mind after discussions with Min Ragan-Kelley and Aaron Smeurer (sympy lead). The main reason (in addition to Keshav's valid arguments) was to have the merge commit serve as an indicator of the fact that there was review, and who did the review, straight into the log. Seen in that way, the merge commit is signal, not noise. More details behind my reasoning here: http://mail.scipy.org/pipermail/ipython-dev/2012-January/008630.html We've made the change and we're all quite happy with the new approach. Cheers, f -- To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
