missing words... It (having files with only 100 lines) doesn't happen at my work (i.e. my work has the same problem, but it's seen as 'normal'),
but one has to ask how / why have we dug the hole so deep and wide (we make bespoke hardware products, which is hard, and involves many disciplines, so multiple 'enterprise grade' storage and versioning tools are in-place) -- Sorry if it sounded as if your problems didn't also happen here ;-) P. On Friday, January 27, 2017 at 8:57:12 AM UTC, Philip Oakley wrote: > Hi, Michael, > > The "100 lines" bit was just to ensure that folks got the idea that they > should give a better indication of measurable scale. > > It doesn't happen at my work, but one has to ask how / why have we dug the > hole so deep and wide that this gross merge conflict continues to repeat > it > self as a regular corporate activity, and then how to get out of > here/there > (and somehow hoping that Git is a silver bullet / holy grail to solve > those > human falibilities). > > I would be very interested in any reasonable method that helps with these > 'divergent codebases' issues. (see "The life cycle of a silver bullet" > Sheard, for a nice parable, only a couple of pages, especially the later > sections where mindless application of tools is done). We do need to > understand the how and why we get into these scenarios, and a similar how > and what for getting out. > > Philip > > If we don't understand, we won't improve ... > https://store.xkcd.com/products/try-science > > ----- Original Message ----- > From: "Michael" <[email protected]> > To: <[email protected]> > Sent: Friday, January 27, 2017 12:48 AM > Subject: Re: [git-users] Git branching and merge strategy for merge with > lots of conflicts requiring multiple people > > > > On 2017-01-26, at 1:12 PM, Philip Oakley <[email protected]> wrote: > > > > Is the project well modularised with no file >100 lines (excepting, > maybe, well developed libraries that never change), > > 100 lines per file?? > > You're joking, right? That's one of those "in theory" things, right? > > First, while I might be able to make each routine of my code 100 lines or > less, I can't make the whole "group" of things less than 100 lines. > > Second, while Objective C lets me have the code for a class in different > files, so that each file can focus on different parts of the class, Java > does not -- all of the class's contents, as well as all of the sub-classes > that the class needs -- has to be in one file. > > 100 lines per file? One sec < ... walks into the distance like the > Mna-me-nah guy > bwa-Ha-HA! <walks back up> Sorry, nope. > --- > Entertaining minecraft videos > http://YouTube.com/keybounce > > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
