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

Enable protected branch for master? #64

Closed
donnemartin opened this issue Dec 17, 2015 · 4 comments
Closed

Enable protected branch for master? #64

donnemartin opened this issue Dec 17, 2015 · 4 comments

Comments

@donnemartin
Copy link
Collaborator

Protected branches are a relatively new and handy feature:

https://github.com/blog/2051-protected-branches-and-required-status-checks

At the very least I think we should enable these for master:

  • Can't be force pushed
  • Can't be deleted

This is also handy too:

  • Can't have changes merged into them until required status checks pass
@jamesls
Copy link
Member

jamesls commented Dec 17, 2015

👍 Haven't actually tried this on any repos yet, but seems like it's worth doing.

@jamesls
Copy link
Member

jamesls commented Dec 17, 2015

Enabled. Also enabled the required status checks pass. Let's see how it goes.

@jamesls jamesls closed this as completed Dec 17, 2015
@jamesls
Copy link
Member

jamesls commented Dec 17, 2015

Hmm, just ran into the first snag. Trying to merge this: #73, github prevents me from merging because there's been other commits to master since the PR was sent.

I get why it's rejecting the push. It's possible that the subsequent commits from master when integrated with the PR branch could cause test failures.

So if I'm understanding correctly, every pull request will become unmergeable as soon as we push any new commits to master. =/ So the options:

  1. Require users to click the update branch, which merges master into the PR branch. Not my preference, it clutters history. I'd prefer they rebase against master.
  2. Require users constantly rebase as we push commits to master.
  3. Pull their branch down locally, rebase against master. Push up to github as our own branch. Wait for travis to pass. Then merge to master.
  4. Not have the required status checks.

What I'd like is something like https://github.com/barosl/homu, which can run the tests and merge for you.

I'm thinking I'm going to disable the required status checks for now.

@donnemartin
Copy link
Collaborator Author

Seems that feature could use an intermediate level to be more practical.

https://github.com/barosl/homu

Awesome...starred.

I'm thinking I'm going to disable the required status checks for now.

I agree I think this is currently the best option.

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

No branches or pull requests

2 participants