RE: The merge from hell...

From: Brown, Len <len.brown@intel.com>
Date: Feb 3, 2006, 06:04 UTC
Message-ID: <F7DC2337C7631D4386A2DF6E8FB22B3005EFE838@hdsmsx401.amr.corp.intel.com>

>The 12-way merge was a bit over the top, but it worked. I'd 
>suggest not being quite _that_ aggressive in the future,
>though, but it's not a big deal.

I favor "assertive" over "aggressive" -- I assert that the tools I use must work as advertised;-)

> #define MAXPARENT (16)

How about setting this #define to the number that you're comfortable with? Then folks like me -- who wouldn't dream of checking code into Linux with a hopped-up git -- will simply obey the limit that comes with the tool?

>One thing I'd ask for: would it be possible to have more descriptive 
>branch names than just numbers? Even if you want to track it 
>by bugzilla entry number, how about calling it "bugzilla-12345" instead?

bugzilla-#### -- no problem -- will do.

thanks, -Len

ps. In the back of my head I was worried about using plain numbers when I saw somebody refer to "shorthand SHA1". Hopefully this is an idle worry and it is not possible for the tool to confuse a numeric branch name with a SHA1 id.