On Mon, Mar 5, 2018 at 4:38 PM, Guillermo Polito <[email protected]> wrote:
> But, "one single class" does not mean anything. Because it depends from > which branch/commitish you are loading it from... > > Can you explain better what is the problem because I am not getting it... > > In any case, independently of where is the burden, I want to veto any new > integration that may make future builds non-reproducible. Otherwise this is > a source of chaos and dead kittens. > > The problem is that actually if you have a git project with a stable and dev branch you will need: - One baseline on the stable branch with determined dependencies versions - One baseline on the dev branch with less restricted versions (for example 3.x.x) Then, when you release a new stable version by merging the development branch you need to edit the merge by hand to merge everything except the baseline. I think this is what Denis wants to avoid. But in general, such merges need to be done only for major and minor releases. Not for a patch because you can do a hotfix. You create a new branch from master, then merge in in master and development when it's done. -- Cyril Ferlicot https://ferlicot.fr
