Strategies for push/merge problem?

Sean Kelley sean.v.kelley at gmail.com
Mon Jul 14 17:28:30 CDT 2008


On Mon, Jul 14, 2008 at 5:16 PM, Doug Philips <dgou at mac.com> wrote:
>
> 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. :)

I personally don't have a problem with history that shows the merges
and the mixed development.  I am too busy to rewrite history  :-)

Sean

>
> --Doug
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>


More information about the Mercurial mailing list