2009/10/12 Ralf Gommers <ralf.gommers@googlemail.com>:

>> In the future, it may be easier not to merge with the master branch.
>> I'm still figuring out the best way to do this, but I think that will
>> be easier since I can then just merge your branch, instead of cherry
>> picking out the changes.
>
> Hmm, not sure how else I would have fixed that test, since it only broke
> after you renamed io.py in the master branch. Why did you have to cherry
> pick, instead of just merging back my imgcollection branch into your master?
>
> Disclaimer: I am also quite new to this way of doing things.

You could simply have created a new branch, and made your changes
there.  One branch per change (or related set of changes) sounds about
right.

If I simply merged, we would have had messages in the commit log such as:

Stefan merged Ralf's branch.
Ralf merged Stefan's main branch.
Ralf changes this and that.

Now, we just have:

Stefan merged Ralf's branch.
Ralf changed this and that.

Have a look at these two articles:

http://article.gmane.org/gmane.comp.video.dri.devel/34744
http://lwn.net/Articles/328436/

Cheers
Stéfan