You're describing something different. The PostgreSQL folks aren't using the merge capability of git at all. They're doing manual diff+patch. This makes sense in a CVS environment where merging back to truck was incredibly, outrageously, ludicrously painful. Not so for git.
Posted Oct 13, 2010 12:12 UTC (Wed) by petereisentraut (subscriber, #59453)
[Link]
The PostgreSQL folks may or may not be using the merge capability in their personal workflow. I certainly use it. We just require that what you apply to the master branch is rebased.