Strategies for push/merge problem?

[Benjamin Smedberg]

Johannes Stezenbach wrote:

> http://developer.mozilla.org/en/docs/Mercurial_FAQ#Push_to_the_central_repository
> 
> It would be interesting to hear how this works out in practise
> for the Mozilla team. If someone finds out please let us know.

It's a source of complaint, but not overwhelming. Some people are content to 
do a merge; others really object to history cluttering and spend time 
rebasing the commit forward, either manually or with MQ.

--BDS