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.

Reply via email to