Restore backwards compatibility in scripted pr merge
#2208
Merged
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
ShubhankarKG
approved these changes
Oct 17, 2020
There was a problem hiding this comment.
Nice! I did not think of this in my PR, but now that I see it, it does break the flow for scriptability purposes. Thanks for bringing this up @mislav ! Does make sense to include a confirmation step only in the interactive merge.
samcoe
approved these changes
Oct 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Followup to #1622, which I've accidentally merged prematurely. I wanted to add these adjustments in:
No added
-y, --confirmflag. We only want confirmation in interactive mode, and users could already choose a non-interactive mode by supplying--merge|--rebase|--squash(and optionally--delete-branch). The added--confirmflag would have broken compatibility with existing scripts by forcing them into interactive mode until they pass in-y.Confirmation step is now part of
prInteractiveMerge()Restore unnecessary indent under
if shouldSubmitFromFlagby returning early on cancellation instead/cc @ShubhankarKG