git: A decision on merging.

A lot of people don't really understand why branch-merging is an ambiguous operation. Here is a good explanation:

http://bramcohen.livejournal.com/74462.html