Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Keep the master branch pristine - use Git-flow #962

Open
haxwell opened this issue Dec 21, 2017 · 4 comments
Open

Keep the master branch pristine - use Git-flow #962

haxwell opened this issue Dec 21, 2017 · 4 comments

Comments

@haxwell
Copy link
Contributor

haxwell commented Dec 21, 2017

So as to keep the master branch as reliable as possible, we should be checking into a develop branch, and merging dev changes into master once the project is ready to release.

Its not a super big deal, but I think it would be good to get in the habit of using the git-flow paradigm to organize development.

If you haven't seen it already, here's how it works: http://nvie.com/posts/a-successful-git-branching-model/

Thoughts?

@haxwell
Copy link
Contributor Author

haxwell commented Dec 21, 2017

I noticed there is a develop branch already, but its way behind master. So, maybe git-flow was tried in the past and abandoned. Regardless, I vote we carry on with it now..

@DeviaVir
Copy link
Owner

I don't have the permissions to change the default branch to develop, so this would mean we would need to ask every time somebody creates a PR.

Another solution is fork this repo someplace else, migrate all the issues and PR's, and have it there. Or pray that @carlos8f comes back at some point.

@haxwell
Copy link
Contributor Author

haxwell commented Dec 21, 2017

Well, if we do move it, I say we move it over to your place.. Thanks for your work, too, @DeviaVir.

the coolest thing about git-flow is that the master branch stays production-ready at all times. So, when we have hiccups like my recent 'period --> periodLength' changes, nothing breaks on the public's default view of the project.

We got through that okay.. as long as developing on master doesn't become a problem (one day, it will..) then we're good here.

@DeviaVir DeviaVir reopened this Dec 28, 2017
@DeviaVir
Copy link
Owner

I've created an unstable branch where we can merge at wish, then we can focus on a git-workflow for master soon.

# for free to subscribe to this conversation on GitHub. Already have an account? #.
Projects
None yet
Development

No branches or pull requests

2 participants