Skip to content
This repository has been archived by the owner on Mar 25, 2021. It is now read-only.

Adjusted Git Workflow Needed #747

Closed
jkillian opened this issue Oct 20, 2015 · 1 comment
Closed

Adjusted Git Workflow Needed #747

jkillian opened this issue Oct 20, 2015 · 1 comment

Comments

@jkillian
Copy link
Contributor

Right now, the master branch is protected, and requires status checks before code can merge. This causes PRs to have to be based off of the newest commit in master (see bottom of this blog post). This makes it very difficult to merge multiple PRs - as soon as one PR is merged, every other waiting PR must be rebased.

One solution to this would be to have an unprotected develop branch that PRs are merged into. This develop branch could be merged into master and next each weekly release. A second option could be to have a releases branch that is protected and make master unprotected. A third, and simplest, option would be to simply turn off the protected status for master.

@jkillian
Copy link
Contributor Author

Going to disable the mandatory status checks feature. This will let us merge PRs that aren't based on the very latest commit, which will be nicer to everyone. We still expect and require all tests to pass, but this won't be done through Github's protected branches feature.

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

No branches or pull requests

2 participants