Skip to content

chore(sync): carry beta back into development - #2698

Merged
rubenvdlinde merged 2 commits into
developmentfrom
sync/beta-to-development-20261016154447
Oct 16, 2026
Merged

rubenvdlinde merged 2 commits into
developmentfrom
sync/beta-to-development-20261016154447

Conversation

@rubenvdlinde

Copy link
Copy Markdown
Contributor

beta held 1 commit(s) development did not — release version bumps committed onto the branch the release ran from, and anything else that arrived out of band. Left unreconciled, both branches change the version file independently and the next development → beta promotion conflicts on it.

0 file(s) change. A 0-file result is the normal and correct outcome once the content has already reached development by other means — recording the ancestry is the payload. Without it the merge base never moves and the next promotion conflicts exactly as before.

Version files were resolved to development's side, whose line is ahead of the released one, so this never moves a version backwards. Any conflict outside them aborts the merge for a human instead.

Opened by fleet-back-merge.yml, using the algorithm release.yml already applies to its own sync/*-to-development pull requests.

@rubenvdlinde
rubenvdlinde merged commit 8ce07a0 into development Oct 16, 2026
1 check passed
@github-actions

Copy link
Copy Markdown
Contributor

Quality Report — ConductionNL/integriq @ 9b5f5f0

Check PHP Vue Security License Tests
lint ✅
phpcs ✅
phpmd ✅
psalm ✅
phpstan ✅
phpmetrics ✅
eslint ✅
stylelint ✅
build ✅
build ✅
check-specs ✅
test-l10n ✅
format ✅
check-schema-l10n ✅
check-l10n-js ✅
composer ✅ ✅ 143/143
npm ✅ ✅ 646/646
app:check-code ⏭️
info.xml ✅
REUSE ❌
lockfile sync ✅
PHPUnit ✅ 5557/5557 · 1 skipped
Newman ✅ 130/130
Playwright ⏭️ deferred: this pull request comes from a release or sync branch, which carries only version strings. E2E runs on the promotions.
Hydra gates ✅
Hydra gates (axe) ✅

Quality workflow — 2026-10-16 15:52 UTC

Download the full PDF report from the workflow artifacts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants