On Wed, Jan 4, 2012 at 11:30 AM, paul cannon <p...@datastax.com> wrote: > On Wed, Jan 4, 2012 at 10:57 AM, Eric Evans <eev...@acunu.com> wrote: >> Personally, I do prefer to rebase my branches while they are private, >> but that's for purposes of easing review; I've never felt I needed a >> flatter history to make life easier (with Git). > > I only read through that article quickly, but it doesn't sound like he ever > even addresses public repos, where rebasing remote heads and pushing > non-fast-forward updates causes pretty massive confusion for people who > aren't pretty familiar with git. Perhaps he's just advocating rebasing > locally? I am 100% in favor of that, and it sounds like Eric is too- > rebase is almost always preferable to merge as long as you're not messing > up any remote heads.
So, can I summarize our policy as "git pull --rebase"? -- Jonathan Ellis Project Chair, Apache Cassandra co-founder of DataStax, the source for professional Cassandra support http://www.datastax.com
