search

beroNet / Open-PBX

embedded PBX based on Asterisk, which runs on a beroNet Gateway
MIT License
5 stars 3 forks source link

Develop with 'Git branching model' of nvie? #3

Open sebastianertz opened 11 years ago

sebastianertz commented 11 years ago

All Developers: Can we agree on the 'git branching model' of nvie?

Links: http://nvie.com/posts/a-successful-git-branching-model/ https://github.com/nvie/gitflow http://splitshade.wordpress.com/2012/04/22/git-flow-einfaches-arbeiten-mit-dem-perfekten-git-workflow/

On Ubuntu 12.04: sudo apt-get install git-flow

crich commented 11 years ago

ok, i like the tool git-flow and i think we should use it. Question is if we can use it on the existing repository?

Internally we're using a similar branching model for the beroFix firmware development, we've got also release branches, feature branches and the development branch.

We need to agree on a naming scheme, i suggest to use the naming scheme from nvie, to make it easier for newcomers to understand our structure:

master develop release-X.y hotfix-X.y.z

Regarding Versioning, i suggest to also use 3 Numbers: Major.Minor.Hotfix

sebastianertz commented 11 years ago

Do you mean with release-X.Y a branch? Because 'git flow release finish 1.0' generate a tag with name '1.0'. Or do you mean the tag name should be 'release-X.Y '?

In hindsight, you can apply git-flow!

crich commented 11 years ago

yes, but before an upcoming release a release-x.y branch is created, which only receives bugfixes, so that this branch can stabilize before getting merged into master.

sebastianertz commented 11 years ago

The standard of command git flow is:

master
develop
feature/
release/
hotfix/
support/

Example release branch name: release/1.2.3

But we can use your structure:

master
develop
feature-
release-
hotfix-
support-

Example release branch name: release-1.2.3

crich commented 10 years ago

I would suggest we create a release from develop before the ael commit. The ael commits introduce major changes which should be reflected in a new branch.

sebastianertz commented 10 years ago

ael now in branch "feature/AEL"

crich commented 10 years ago

I'd like to make a couple of fixes to the non-AEL version, but for this i must either drop the AEL commits from develop or create a new branch. What would be the appropriate attempt ?

sebastianertz commented 10 years ago

I have create a new branch "feature/AEL"