[tunesmith]

I just never find rebase very relevant because we'll have team members collaborate on the same branch. If you want to collaborate on an in-progress story that has its own branch, you have to push your commits. You might be able to rebase on any commits you push into the branch, but when it comes time to merge the branch into the main line (which might have received several commits in the meantime), you have to stick with the timeline of those pushes, so you lose much of the benefit of rebase.

Not sure why the author says that is weird - I can't think of an alternative if people are truly collaborating or pairing on a feature.

[dcadenas]

That's true but using branches is not always a good idea specially if you want to collaborate in big projects and have strong communication with your team.

Master can be used as a chat room (substitute english with code) and leave branches for very specific cases when that doesn't work. That's basically doing continuous integration. If you prefer, you can think of it as if you are still having branches with one commit each ;).

The important thing for CI is being sure that each commit is either hidden (through a feature toggle maybe?) or it doesn't break anything.