[GitHub] csantanapr commented on issue #8: avoid merge commits and create a linear git history

[gi...@git.apache.org]

csantanapr commented on issue #8: avoid merge commits and create a linear git history
URL: https://github.com/apache/incubator-openwhisk-utilities/issues/8#issuecomment-305559158
 
 
   Yes we can enable the setting.
   Already opened an INFRA ticket to get all the openwhisk repos configured the same way.
   Including the merge button, protecting master branch and requiring reviews
   https://issues.apache.org/jira/browse/INFRA-14229
   
   ```
   There are two parts of configuration that we need: 
   
   1. Merge Buttons 
   Picture here: https://www.evernote.com/l/ACKKqQgQ3jdH-oU5xP0TAFg2HGOyU3Nnb9U 
   In "Options" 
   Uncheck "Allow merge commits" 
   Check "Allow squash merging" 
   Check "Allow rebase merging" 
   
   2. Protected master branch, uncheck require branches to be up to date before merging 
   Picture here; https://www.evernote.com/l/ACLutEKymVlJIpSl55SkBecX67oOt2aEDmU 
   The github repo needs to be configure with protected branch for master. 
   But the settings for the protected should be as follow 
   - Check "Protect this branch" 
   - Check "Require pull request reviews before merging" 
       - UnCheck "Dismiss stale pull requests approvals..." 
       - UnCheck "Restrict who can dismiss pull requests reviews" 
   - Check "Require status checks to pass before merging" 
       - UnCheck "Require branches to be up to date before merging" 
   - UnCheck "Restrict who can push to this branch" 
   - UnCheck "Include administrators" 
   ```
 
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services