On Tue, 18 Dec 2018 at 03:19, Torsten Bergmann <[email protected]> wrote:
> > Model 2: Work with several open branches - one per Pharo version > ================================================================ > > In DesktopManager which is on > https://github.com/astares/Pharo-DesktopManager I do it differently. I > wanted to maintain it for Pharo7 > now but wanted to still easily backport changes to Pharo 6. > > For this project I maintain therefore two special branches "pharo6" and > "pharo7" - each for a particular Pharo version. > > This allows me to maintain the differences between the Pharo 6 and Pharo 7 > version by using the two distinguished branches > and backport from the "pharo7" branch easily to the "pharo6" branch if > necessary. > In the past I've contemplated that this form might be a good way to manage cross-platform code, but also having a "master" and merge from there into each "pharo6" , "pharo7" , "squeakN" platform-branch if/when they get some git tools. The workflow might then be that users of a particular platform push can issue a PR to that particular platform-branch to make the changes easy to see, and integrate into "master" if useful. cheers -ben The second model fits better if you provide packages that you would like to > maintain for several Pharo versions from 6.0 > onwards. I now also use it to maintain "QuickAccess", "OSWindows", > "OSUnix", ... and others. >
