Define a clear git branching model

JR Jason Robinson Public Văzut de 45
JR

Poll Created Sat 1 Sep 2012 8:32PM

Define a clear git branching model Inchis Sat 15 Sep 2012 1:05PM

Rezultat
de catre Jason Robinson Tue 25 Apr 2017 5:15AM

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

Rezultate

Rezultate Opțiune % din puncte Alegătorii
De acord 100.0% 9 ST FS BO JH JR F M DY SH
abține-te 0.0% 0  
Dezacord 0.0% 0  
bloc 0.0% 0  
Nehotărât 0% 43 MS TS AA S CB HF DM GC JH EG G AX PP BB T RF DM DS EP S

9 din 52 persoane au participat (17%)

FS

Florian Staudacher
De acord
Sun 2 Sep 2012 12:31AM

I agree, but further details have to be worked out

ST

Sean Tilley
De acord
Sun 2 Sep 2012 8:01PM

I think this would definitely be useful for stabilizing devolopment.

M

movilla
De acord
Wed 5 Sep 2012 5:20PM

Yes please :]

JR

Jason Robinson
De acord
Thu 6 Sep 2012 12:05PM

I guess proposal makers are allowed a vote too :)

DY

Dave Yingling
De acord
Fri 14 Sep 2012 6:58PM

Great idea.

JH

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?

AA

Alex Andrews Mon 3 Sep 2012 8:10AM

JR

Jason Robinson Mon 3 Sep 2012 8:14AM

Interesting :) Will defo take a look

JH

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?

Incarca mai mult