Fixed up the squash and merge support to match the git api. #768
Conversation
This file contains hidden or 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
…h method has been removed and there is now a 'merge_method' parameter. See https://developer.github.com/changes/2017-04-07-end-merge-methods-api-preview/ for more details.
|
I can see the tests failed. I'll look to fix them up. |
|
Hey there, this is a great start. I'm wondering if you'd be willing to rebase to get rid of the test failures in |
added 2 commits
January 7, 2018 19:11
|
Tests are now passing. So it should be in a good state for merging in. |
omgjlk
approved these changes
Jan 12, 2018
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.
The squash parameter has been removed form the github API. There is now a 'merge_method' parameter. See https://developer.github.com/changes/2017-04-07-end-merge-methods-api-preview/ for more details.
This PR changes the pull request merge method to allow the merge_method to be set. It is optional and has the same default value (merge) as the underlying github API.
The squash method has been removed as this no longer works.