Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Establish a Git-flow process #10

Closed
shayneptorres opened this issue Mar 8, 2020 · 3 comments
Closed

Establish a Git-flow process #10

shayneptorres opened this issue Mar 8, 2020 · 3 comments

Comments

@shayneptorres
Copy link
Contributor

In order to ensure that contributors are not merging directly into master, and that there are no confusions with feature/bug/enhancement branches I would suggest that we establish a gitflow process.

I recommend that we create a develop branch that all feature/bug/enhancement branches will branch off. All PRs should be made against the develop branch. Only specified admin can merge develop back into the master. The master branch is the final state before the new build is submitted to app store.

Please let me know if there are any suggestions/comments/critiques/concerns.

@eddielement
Copy link
Contributor

I'd be down for this. Alternatively, we could make a Release branch that is the final submitted build for each Release and treat master like Develop. Any thoughts? Maybe we should make a contributing.MD file outlining the process?

@shayneptorres
Copy link
Contributor Author

As the master of the repo, it is totally up to you. In my experience, its been convention to have the develop branch which gets branched off for work, PR'd and then merged back into master. I believe that is the official Git Flow process too but it's not a hill that I will die on. As long as we can keep the work organized.

@eddielement
Copy link
Contributor

Sounds good, I'll make a Release branch and then work on a Contributing.MD file today. Will reach out for feedback once I have a draft up! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants