Good morning, a more detailed explanation of the Git branching model we are reasonably close to can be found at http://nvie.com/posts/a-successful-git-branching-model/.
Greetings, -- * David ‘Bombe’ Roden – bo...@pterodactylus.net On 19.06.2014, at 23:37, Matthew Toseland <matt...@toselandcs.co.uk> wrote: > On 19/06/14 22:28, xor wrote: >> On Wednesday, June 18, 2014 07:19:34 AM Steve Dougherty wrote: >>> Correct. [0] >> >>> If we want to add more branches, in view of the rate limits [1] it may >>> make sense to set up push hooks and keep track of and render the list on >>> the server. That'd require some significant infrastructure work though. >>> It could be the push to Pelican finally. [2] >> >> Alright thanks. Well given our limited resources, not too much should be >> invested in this. >> Still, it IS useful to make the site display commits so people see >> that the >> project is alive. And development should use branches much more so >> master is >> always in a stable state. But on the other hand it is a good idea to >> not only >> do major big new feature development but once in a while do small minor >> improvements so they get done as well. And those can be done on master >> while >> larger subprojects are still in a separate branch. I want to take care of >> small stuff more often anyway. >> Dunno. If someone feels like fixing it, it would be nice, but its not >> very >> important probably :| > For fred we roughly follow the model posted some time back: > - master is the latest release. > - next is stuff we want to go into the next release. > - stable-1234 is the release branch for build 1234. > - Everything else is a "feature branch", i.e. something being worked on > but not ready for general testing/merging yet. > > Hence what we should watch is "next". > > _______________________________________________ > Devl mailing list > Devl@freenetproject.org > https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl _______________________________________________ Devl mailing list Devl@freenetproject.org https://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
