Support different methods for merging a pull request via autosubmit and revert #2442
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
This reverts commit 0555407.
yusuf-goog
approved these changes
Feb 1, 2023
nehalvpatel
reviewed
Feb 1, 2023
nehalvpatel
reviewed
Feb 1, 2023
ricardoamador
force-pushed
the
merge_rebase_support
branch
from
d9058db
to
b4074dc
Compare
|
Abandoning this because the commit history for this branch is not in a good state. |
8 tasks
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.
This change will allow users to specify the merge strategy type by adding a comment to the open pull request in the format of:
'@autosubmit:merge',
'@autosubmit:rebase',
or
'@autosubmit:squash'.
If this comment is present the chosen merge strategy will be used to merge the pull request.
The default merge strategy that will be used is squash which is what is currently used to merge a pull request via the autosubmit bot.
List which issues are fixed by this PR. You must list at least one issue.
Fixes flutter/flutter#118361
Fixes flutter/flutter#114557
If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.