#1190 - limit merge methods #2224
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
mislav
reviewed
Nov 11, 2020
|
@divbhasin Thanks for your contribution. I went ahead and merged in the latest trunk, updated some of the functionality to properly handle when a repository does not have all merge options available, and cleaned up the tests a bit. It should be good to go now 🥳 |
samcoe
approved these changes
Jan 21, 2021
vilmibm
approved these changes
Jan 22, 2021
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.
Fix #1190. I plan to address the bonus points mentioned in the issue but the trouble I am having is how to modify the
TestPRMerge_interactive(in /pkg/cmd/pr/merge/merge_test.go) to work with this modified code. The repoREPOwe use to test does not have any of the 3 options enabled, so the prompt never appears and the 2nd HTTP stub does not get matched. How do I make sure that at the time REPO is created, it is created with at least 1 of the merge PR options?