revert: ci(mergify): update PRs via rebase by default instead of merge commit"#35956
Merged
mergify[bot] merged 1 commit intomainfrom Nov 5, 2025
Merged
Conversation
aemada-aws
changed the title
aws-cdk-automation
added
the
pr/needs-maintainer-review
kumsmrit
approved these changes
Nov 5, 2025
aws-cdk-automation
removed
the
pr/needs-maintainer-review
Contributor
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
…e commit…" This reverts commit 1d96d6b.
mergify
bot
force-pushed
the
revert-35894-mergify/aemada-aws/config-update
branch
from
10fc024 to
ff4cb27
Compare
Contributor
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Contributor
|
Comments on closed issues and PRs are hard for our team to see. |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Reverts #35894 as it is causing issues with auto approve PRs, as they would require impersonation.
The rebase strategy was added because whenever someone updates a workflow file, the merge commit update fails because of a Github security feature that prevents Github apps (Mergify) from updating workflow files unless they have the workflows permission.
We reverted it because it is causing more issues than it solves, all auto approve PRs are not being merged anymore and the case of updating workflows is not very frequent to be worth the change.