cassandra-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jonathan Ellis <jbel...@gmail.com>
Subject Re: Cassandra has moved to Git
Date Wed, 04 Jan 2012 21:19:40 GMT
On Wed, Jan 4, 2012 at 11:48 AM, paul cannon <paul@datastax.com> wrote:
> On Wed, Jan 4, 2012 at 11:40 AM, Jonathan Ellis <jbellis@gmail.com> wrote:
>
>> So, can I summarize our policy as "git pull --rebase"?
>>
>
> I'd rather have the normal case be to use topic branches for work, so
> --rebase doesn't come in to the picture, but yeah, pull --rebase is a
> better default.

You're right.  So in the topic branch workflow, I would write that as
"commit by cherry-pick from topic to master, then push."

-- 
Jonathan Ellis
Project Chair, Apache Cassandra
co-founder of DataStax, the source for professional Cassandra support
http://www.datastax.com

Mime
View raw message