Strategies for push/merge problem?

[Doug Philips]

On Monday, July 14, 2008, at 05:58PM, "Benjamin Smedberg" indited:
>Johannes Stezenbach wrote:
>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.

Yes, it takes effort to make the history something that it is not.
The merges show just where things went parallel and how they were merged.
rebasing makes believe that one thing happened after another.
Since that isn't actually what happened, work has to be spent re-writing history. :)

--Doug