Skip to content

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

Closed
rubenvdlinde wants to merge 3 commits into
developmentfrom
sync/main-to-development-0.4.0
Closed

chore(release): sync main back into development#1863
rubenvdlinde wants to merge 3 commits into
developmentfrom
sync/main-to-development-0.4.0

Conversation

@rubenvdlinde

Copy link
Copy Markdown
Contributor

Opened by the release workflow after publishing 0.4.0 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.

rubenvdlinde and others added 3 commits September 6, 2026 12:05
Release: merge development into beta
Release: merge beta into main
The 0.4.0 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.
@github-actions

github-actions Bot commented Sep 6, 2026

Copy link
Copy Markdown
Contributor

Quality Report — ConductionNL/integriq @ 0a0a924

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 ✅ 141/141
npm ✅ 537/537
app:check-code ⏭️
info.xml
REUSE
PHPUnit
Newman
Playwright ⏭️ deferred — runs on the promotion into beta/main, not on a pull request into development
Hydra gates

Quality workflow — 2026-09-06 12:08 UTC

Download the full PDF report from the workflow artifacts.

@rubenvdlinde

Copy link
Copy Markdown
Contributor Author

Closing this as measured noise, not as work skipped.

Right now main is ahead of development by 0 commit(s) and 0 changed files, and beta by 0 commit(s) and 0 changed files. Nothing on the release branches is missing from development, so this sync has no content to carry and the ancestry it would record is already recorded.

Measured 2026-09-09 with gh api repos/ConductionNL/integriq/compare/development...main and the same against beta. If that reading is wrong, reopening this is one click.

auto-merge was automatically disabled September 9, 2026 05:55

Pull request was closed

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