Skip to content

chore(sync): carry main back into beta - #1581

Open
rubenvdlinde wants to merge 2 commits into
betafrom
sync/main-to-beta-20260830191221
Open

chore(sync): carry main back into beta#1581
rubenvdlinde wants to merge 2 commits into
betafrom
sync/main-to-beta-20260830191221

Conversation

@rubenvdlinde

Copy link
Copy Markdown
Contributor

main held 1 commit(s) beta 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 betamain promotion conflicts on it.

0 file(s) change. A 0-file result is the normal and correct outcome once the content has already reached beta 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 beta'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.

@github-actions

Copy link
Copy Markdown
Contributor

Quality Report — ConductionNL/pipelinq @ 038134d

Check PHP Vue Security License Tests
lint
phpcs
phpmd
psalm
phpstan
phpmetrics
eslint
stylelint
build
check-manifest
check-vue-demi
test-l10n
format
check-schema-l10n
check-l10n-js
composer ✅ 106/106
npm ✅ 645/645
app:check-code ⏭️
info.xml
REUSE
PHPUnit
Newman
Playwright
Hydra gates

Spec coverage: 68% — 212 of 313 enforceable scenarios carry an @e2e reference (threshold 20%, 2362 excluded with a reason).


Quality workflow — 2026-08-30 23:32 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