Define a clear git branching model
proposal by Jason Robinson Closed Sat 15 Sep 2012 1:05PM
Accepted and taken in to use - documented at https://github.com/diaspora/diaspora/wiki/Git-Workflow
Currently AFAIK master is whatever was pushed last by a developer who has rights to push to master.
We need a better clear branching model that allows anyone to pick out whatever they need, be it a stable branch, the current development head or a feature branch.
I suggest we follow the clear branching model explained in this post:
http://nvie.com/posts/a-successful-git-branching-model/
Some highlights;
1) Master always contains the release code, in addition releases are tagged
2) Development head is called the 'develop' branch. This is where developers with sufficient access merge pull requests and feature branches
3) (Optional in future, maybe when things have evolved) Release branches are branched from develop to form candidates for a release
4) Feature branches are branched from develop to work on larger features
Results
| Results | Option | Votes | % of votes cast | % of eligible voters | |
|---|---|---|---|---|---|
| Agree | 9 | 100 | 17 |        | |
| Abstain | 0 | 0 | 0 | ||
| Disagree | 0 | 0 | 0 | ||
| Block | 0 | 0 | 0 | ||
| Undecided | 43 | 83 |              |
9 of 52 votes cast (17% participation)
Florian Staudacher
Sun 2 Sep 2012 12:31AM
I agree, but further details have to be worked out
Sean TilleySun 2 Sep 2012 8:01PM
I think this would definitely be useful for stabilizing devolopment.
movillaWed 5 Sep 2012 5:20PM
Yes please :]
Jason RobinsonThu 6 Sep 2012 12:05PM
I guess proposal makers are allowed a vote too :)
Dave YinglingFri 14 Sep 2012 6:58PM
Great idea.
Alex AndrewsMon 3 Sep 2012 8:10AM
User Gitflow? https://github.com/nvie/gitflow
Jason RobinsonMon 3 Sep 2012 8:14AM
Interesting :) Will defo take a look
Jonne HaßThu 6 Sep 2012 10:10AM
Since I see a consensus here, another question came into my mind we need a decision for IMO: How long to keep branches once they are merged? Delete them right away with the merge? Wait a week? Keep them forever?
Jeremy Huffman ·Sun 2 Sep 2012 12:47AM
I think the devil is in the details. What do you call "release ready?" Right now it should not go in master until it passes Travis. What else would we do to certify a release version?