Skip to content

Commit 13826ee

Browse files
fix(mergify): remove auto-update rule that adds merge commits
The update action always creates merge commits when bringing PRs up to date with main. The rebase action that previously handled this correctly is deprecated for fork PRs after July 1, 2026. Remove the auto-update rule entirely. Contributors can use the existing conflict notification and manual @mergify rebase when needed. Closes: #1069 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
1 parent 0d5711d commit 13826ee

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

.mergify.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,6 @@ pull_request_rules:
7878
merge:
7979
method: merge
8080

81-
- name: Auto-update approved PRs that are behind
82-
conditions:
83-
- "-draft"
84-
- "-conflict"
85-
- "#commits-behind>0"
86-
- "base=main"
87-
- "#approved-reviews-by>=1"
88-
- "author!=dependabot[bot]"
89-
actions:
90-
update:
91-
9281
- name: Ping author on conflicts
9382
conditions:
9483
- "conflict"

0 commit comments

Comments
 (0)