Skip to content

chore(release): sync main back into development - #1206

Open
rubenvdlinde wants to merge 4 commits into
developmentfrom
sync/main-to-development-0.3.8
Open

rubenvdlinde wants to merge 4 commits into
developmentfrom
sync/main-to-development-0.3.8

Conversation

@rubenvdlinde

Copy link
Copy Markdown
Contributor

Opened by the release workflow after publishing 0.3.8 from main.

A release commits a version bump onto the branch it ran from. Without carrying
that back, development falls behind main, and since both branches then
changed the version file independently, the next development -> main
promotion conflicts on it — every time.

Version files are resolved to development's side, the higher line, so this
cannot move a version backwards. Any other conflict stops the workflow instead
of being resolved automatically.

Merge this, do not squash. A squash copies the files and discards the
relationship: the merge base would not move and the next promotion would
conflict exactly as before. A 0-file diff here is normal and is not a no-op —
recording the ancestry is the whole point.

rjzondervan and others added 4 commits October 7, 2026 14:05
Release: merge development into beta
Release: merge beta into main
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
The 0.3.8 release bumped the version on main. Without this,
development stays behind main and the next development -> main promotion
conflicts on the version file.

Version files resolve to development's side, which is the higher line,
so this never moves a version backwards.
@rubenvdlinde
rubenvdlinde enabled auto-merge October 7, 2026 12:54
@github-actions

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

Quality Report — ConductionNL/keepiq @ aa24e68

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

Quality workflow — 2026-10-07 13:11 UTC

Download the full PDF report from the workflow artifacts.

This branch has not been deployed

No deployments
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