Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

On 2017-01-27, at 12:57 AM, Philip Oakley wrote: > > 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

[git-users] fatal error when diffing changed symlinks

Hi, with the commands below, you will get : > fatal: bad object > show : command returned error: 128 > I am using version 2.5.5 fedora 23 cd /tmp mkdir a cd a git init touch b ln -s b c git add . git commit -m

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

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

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

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

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

On Thursday, 26 January 2017 16:37:16 UTC-5, Magnus Therning wrote: > > > Stephen Morton writes: > > > I'm looking for a git branching and merge strategy for merge with lots > > of conflicts requiring multiple people. I can make it work, and I > > understand git, but it