The auto-merge script rebased and force-pushed when the branch was behind master. This push triggered a new pull_request: synchronize event, starting a new CI run with another auto-merge job, which rebased and pushed again — creating an infinite loop of duplicate CI runs.
Fix
When the branch is behind master, auto-merge now fails with a clear message asking the user to rebase manually. The pre-merge-check job already validates this, but master can advance between pre-merge-check and auto-merge execution.
Impact
This fixes the duplicate CI runs observed in all repos using devx (infra, grm, devx).
Closes DEVX-49
## Changes
The auto-merge script rebased and force-pushed when the branch was behind master. This push triggered a new `pull_request: synchronize` event, starting a new CI run with another auto-merge job, which rebased and pushed again — creating an infinite loop of duplicate CI runs.
### Fix
When the branch is behind master, auto-merge now fails with a clear message asking the user to rebase manually. The `pre-merge-check` job already validates this, but master can advance between pre-merge-check and auto-merge execution.
### Impact
This fixes the duplicate CI runs observed in all repos using devx (infra, grm, devx).
Closes DEVX-49
Documentation: WARNING — source files changed but no docs updated
Tests: OK
Commit conventions: OK
No issues found by automated checks.
Auto-merge: If all CI checks pass, this PR will be merged automatically.
## Automated PR Review
- Architecture compliance: OK
- Best practices: OK
- Security: OK
- i18n: OK
- Resource management: OK
- Documentation: WARNING — source files changed but no docs updated
- Tests: OK
- Commit conventions: OK
No issues found by automated checks.
---
**Auto-merge:** If all CI checks pass, this PR will be merged automatically.
Documentation: WARNING — source files changed but no docs updated
Tests: OK
Commit conventions: OK
No issues found by automated checks.
Auto-merge: If all CI checks pass, this PR will be merged automatically.
## Automated PR Review
- Architecture compliance: OK
- Best practices: OK
- Security: OK
- i18n: OK
- Resource management: OK
- Documentation: WARNING — source files changed but no docs updated
- Tests: OK
- Commit conventions: OK
No issues found by automated checks.
---
**Auto-merge:** If all CI checks pass, this PR will be merged automatically.
emil
merged commit af610d22ec into master2026-06-25 19:29:46 +00:00
emil
deleted branch DEVX-49-fix-auto-merge-rebase-loop2026-06-25 19:29:46 +00:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
emil
Changes
The auto-merge script rebased and force-pushed when the branch was behind master. This push triggered a new
pull_request: synchronizeevent, starting a new CI run with another auto-merge job, which rebased and pushed again — creating an infinite loop of duplicate CI runs.Fix
When the branch is behind master, auto-merge now fails with a clear message asking the user to rebase manually. The
pre-merge-checkjob already validates this, but master can advance between pre-merge-check and auto-merge execution.Impact
This fixes the duplicate CI runs observed in all repos using devx (infra, grm, devx).
Closes DEVX-49
Automated PR Review
No issues found by automated checks.
Auto-merge: If all CI checks pass, this PR will be merged automatically.
9ffcbe6063to7fff924413Automated PR Review
No issues found by automated checks.
Auto-merge: If all CI checks pass, this PR will be merged automatically.