search

seeds-of-creativity / home

Home page for the non-profit
MIT License
0 stars 2 forks source link

Branching Strategy #3

Closed jannton closed 7 years ago

jannton commented 7 years ago

Integration Feature Master (Suggestions)

iraleigh commented 7 years ago

I would like the master branch to always being a working version of the app. I am not sure if it should be a reflection of the current release, or if it should be a few steps ahead of the current release -- open to opinions here.

branching off of master would be a development branch that has not been through any sort of QA.

It would be great if we had a heroku instance running with both of these branches so we can do testing on these branches.

beyond that, I don't want release branches, as we should be continually releasing and not have to worry about different versions of the app floating around the branches.

two other branch types i am thinking of are feature branches off of the development branch and and hotfix (hopefully unnecessary) off of the master branch.

iraleigh commented 7 years ago

Totally open to ideas and opinions though, all that was just my initial idea

iraleigh commented 7 years ago

@jannton you have more dev ops experience, what do you think would be best?

dianangyn commented 7 years ago

As of 7/17/17:

iraleigh commented 7 years ago

I think we have settled on a branching strategy. Closing this issue.