On 20/03/16 02:34, James Starkey wrote: > An experienced developer might have 10 or 20 topics on the go - each in > their own separate branches. That way work doesn't cross-contaminate - > you don't want to accidentally upload a half-baked development because > you had to upload an unrelated emergency bug-fix ... :-) > > A developer who does that, experienced or novice, is going to lose > his or her mind. Been there, done that, went nuts. One can only juggle > so much complexity.
I'll second that ... especially when one is sharing work with other developers that has not yet even been flagged with a push to the main repo. In my case several third party components each with their own github master. To retain sanity here I keep the repository views of the code ring fenced in their own clean folders and then use 'BeyondCompare' to cherry pick any new work that potentially conflicts with my own developments. The automatic merges done by git may hide things you want to pick up on? This is where 'submodule' access to a third party library can conflict with the version that you are currently working with. Working on a single target program *IS* a lot easier than some of the projects that I'm working with, but having a clean base to build on is essential? And as I understand it, having one 'release manager' controlling the 'master' code branch is sensible? -- Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk Rainbow Digital Media - http://rainbowdigitalmedia.co.uk ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
