Skip to content

chore: sync the v1.1.6 promotion merge into development - #456

Merged
mohanagy merged 1 commit into
developmentfrom
chore/sync-main-ancestry-v116
Sep 18, 2026
Merged

mohanagy merged 1 commit into
developmentfrom
chore/sync-main-ancestry-v116

Conversation

@mohanagy

Copy link
Copy Markdown
Owner

Pull request

Summary

Refs #453. Brings the v1.1.6 promotion merge (d5a932d, PR #455) into development's ancestry so the two long-lived branches do not drift.

Each release promotion lands a merge commit on main that development never receives. Left unsynced, the next promotion pull request reports BEHIND and surfaces a phantom textual conflict that is not real.

Content is unchanged. git diff <development-head-before> HEAD --stat is empty — this is an ancestry fix only, no file differs.

Merge with a merge commit. Do not squash. Squashing here defeats the entire purpose: it would create a new SHA that main never receives and reintroduce the drift this pull request exists to remove.

Verify afterwards with git merge-base --is-ancestor origin/main origin/development.

Security impact

None. No file content changes; this only records main's promotion merge in development's history.

Validation

  • A failing test was observed first for each behavior or configuration-contract change — not applicable, no content change.
  • git diff between the previous development head and this branch is empty.
  • The published v1.1.6 artifact is unaffected; this does not alter any released commit.

🤖 Generated with Claude Code

chore(release): promote v1.1.6 to main
@mohanagy
mohanagy merged commit a1bd4e3 into development Sep 18, 2026
24 checks passed
@mohanagy mohanagy mentioned this pull request Sep 18, 2026
6 tasks

This branch was successfully deployed

1 active deployment
npm — d5a932de Deployed Sep 18, 2026 by mohanagy via Publish to npm #24
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