Thanks for explaining and esp. pointing to archives — had a great read. And, in hindsight, the process is self-explanatory from the repo history.
On Wed, Jan 15, 2014 at 6:48 PM, Jeffrey Kegler < [email protected]> wrote: > At one time, discussion was held about git branching in this group, and > that article came up. The discussion started with everyone in favor of it > except Ruslan Zakirov, who counter-proposed a much simpler one -- so simple > I had great trouble convincing myself it would work, and it took Ruslan Z. > some effort to convince me. > > Ruslan Z.'s counter-proposal, apparently based on considerable experience > in industrial-strength use, is one-branch, with tags for relases and > (hopefully) short-lived side branches for releases, when necessary. The > release side-branches are quickly merged back into the main branch. > > After a lot of experience with it, I can report that it works beautifully, > and is a big contribution by Ruslan Z's to Marpa -- it has saved me a *lot* > of effort. > > The whole discussion is in our archives, if you're curious. > > -- jeffrey > > On 01/15/2014 07:57 AM, Ruslan Shvedov wrote: > > Just read A successful Git branching model — full > text<http://nvie.com/posts/a-successful-git-branching-model/>, > cheatsheet <http://nvie.com/files/Git-branching-model.pdf>: > > 1. core branches: master (stable, production) branch, develop is, well, > dev branch. > 2. derived branches: > > feature > > naming: anything except master, develop, release-*, or hotfix-* > > create from: develop > > merge into: develop > > release > > names: release-* > > create from: develop > > merge into: develop and master > > hotfix > > names: hotfix-* > create from: master > merge into: develop and master > > 3. detailed workflow with git commands > > Nothing terribly novel, I'm afraid (please bear with my neophyte ado) > :), but structured nicely and from the trenches. > > Perhaps smth. like this, e.g. > > > core branches > > safe (guaranteed stable) > master (stable unless declared otherwise) > > derived branches > > rel(eng)-*, fix-*, feat-*? > > > is worth to be documented for Marpa in (much needed, I think) Marpa's > 'How to Contribute' guide? > > > -- > You received this message because you are subscribed to the Google Groups > "marpa parser" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- > You received this message because you are subscribed to the Google Groups > "marpa parser" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "marpa parser" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
