On Tue, Jan 3, 2012 at 1:21 PM, paul cannon <p...@datastax.com> wrote: > Surely we'd want to follow normal git practices here: rebasing is almost > never appropriate once a branch is pushed to a public repo, where other > people might have gotten it. > > Where you might rebase a plain patch series on top of new developments in a > target SVN branch, you probably just ought to merge the target git branch > into your topic branch instead. Same effect, but retains history.
I dunno, my experience has been that merge commits cause more harm in my ability to understand history, than I gain in benefit. Merge commits mean another place to look to understand "what really changed in this patch." http://darwinweb.net/articles/the-case-for-git-rebase makes a good case for a rebase-based workflow, particularly with respect to bisecting (which has been instrumental in tracking down regressions for us more than once). -- Jonathan Ellis Project Chair, Apache Cassandra co-founder of DataStax, the source for professional Cassandra support http://www.datastax.com
