Re: Rules of thumbs for committers

2012-02-14 Thread Peter Schuller
> - Turn on rebase for public branches ("git config branch.$name.rebase > true" for name in cassandra-0.8 through trunk) And for the record, this means that "git pull" becomes the equivalent of "git pull --rebase", avoiding a constant stream of merge commits on every pull+push iteration. -- / Pe

Rules of thumbs for committers

2012-02-14 Thread Jonathan Ellis
Since we've added a bunch of committers AND switched version control systems recently, it's worth a reminder: - Merge from older branches to newer (i.e., merge 1.0 into 1.1 and 1.1 into trunk) - If you commit to (and push) a newer branch first, then discover you need the change in an older branch