GitHub Automerge Types #466
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Codecov Report
@@ Coverage Diff @@
## master #466 +/- ##
=========================================
+ Coverage 70.53% 70.6% +0.06%
=========================================
Files 63 63
Lines 4243 4259 +16
=========================================
+ Hits 2993 3007 +14
- Misses 1028 1029 +1
- Partials 222 223 +1
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For repos with certain merge methods disabled (such as 'merge'), simply
hitting the GitHub
/mergeendpoint is not sufficient. Instead, we needto check which methods are actually available, then use the appropriate
method.
With this change it will:
Notes: