# RE: The merge from hell... 3 messages from 2006-02-03 to 2006-02-03. Participants: Brown, Len, Linus Torvalds, Junio C Hamano. Thread: https://gitlist.dev/t/3225 ## Brown, Len, 2006-02-03 06:04 Subject: RE: The merge from hell... Message-ID: URL: https://gitlist.dev/e/F7DC2337C7631D4386A2DF6E8FB22B3005EFE838%40hdsmsx401.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. ``` ## Linus Torvalds, 2006-02-03 06:16 Subject: RE: The merge from hell... Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0602022210540.3462%40g5.osdl.org In-Reply-To: ``` On Fri, 3 Feb 2006, Brown, Len wrote: > > 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. It _is_ possible, but the rule is that references will be resolved first. If you mis-type a reference and it could be construed as a short hex SHA1 ID (it needs to have more than 5 characters in it to trigger, though), the auto-completion of SHA1 ID's could bite you, though. It's pretty unlikely, of course. But it's one reason to try to avoid using ref names that are numeric. Linus ``` ## Junio C Hamano, 2006-02-03 06:33 Subject: Re: The merge from hell... Message-ID: <7v1wylj6i5.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v1wylj6i5.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Linus Torvalds writes: > On Fri, 3 Feb 2006, Brown, Len wrote: >> >> 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. > > It _is_ possible, but the rule is that references will be resolved first. I have to admit that I had this broken for a while. The breakage was when you have the same numeric branch name _and_ tagname, then ref resolution was skipped and short SHA1 was taken. It _might_ have bitten somebody in real life until I fixed it. But I believe this is fixed now. > It's pretty unlikely, of course. But it's one reason to try to avoid using > ref names that are numeric. Or even non numeric ones, like "deadbeef". ```