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

GitHub Automerge Types #466

Merged
merged 2 commits into from
Feb 11, 2019
Merged

GitHub Automerge Types #466

merged 2 commits into from
Feb 11, 2019

Commits on Feb 7, 2019

  1. [automerge] Use available merge methods.

    For repos with certain merge methods disabled (such as 'merge'), simply
    hitting the GitHub `/merge` endpoint is not sufficient. Instead, we need
    to check which methods are actually available, then use the appropriate
    method.
    
    With this change it will:
    
     1. Default to 'merge' if enabled
     2. Use 'rebase' if 'merge' is disabled and rebase is enabled
     3. Use 'squash' if 'merge' is disabled
    Brenden Matthews committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    862b522 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Configuration menu
    Copy the full SHA
    def41f6 View commit details
    Browse the repository at this point in the history