Skip to content

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

Merged
rubenvdlinde merged 2 commits into
developmentfrom
sync/beta-to-development-20260831012011
Aug 31, 2026
Merged

chore(sync): carry beta back into development#491
rubenvdlinde merged 2 commits into
developmentfrom
sync/beta-to-development-20260831012011

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 developmentbeta 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 07ac0b0 into development Aug 31, 2026
1 check passed
@github-actions

Copy link
Copy Markdown
Contributor

Quality Report — ConductionNL/launchpad @ 7e97211

Check PHP Vue Security License Tests
lint
phpcs
phpmd
psalm
phpstan
phpmetrics
eslint
stylelint
build
check-manifest
format
check-schema-l10n
composer ✅ 104/104
npm ✅ 526/526
app:check-code ⏭️
info.xml
REUSE
PHPUnit
Newman
Playwright 🚨 NO VERDICT — enabled but never ran
Hydra gates

Quality workflow — 2026-08-31 01:48 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.

1 participant