Skip to content

fix: promote dev to master#591

Merged
icebear0828 merged 1 commit into
masterfrom
promote/dev-to-master-20260522
May 22, 2026
Merged

fix: promote dev to master#591
icebear0828 merged 1 commit into
masterfrom
promote/dev-to-master-20260522

Conversation

@icebear0828
Copy link
Copy Markdown
Owner

Summary

  • promote the current dev tree plus fix: harden dev promotion readiness #590 promotion-readiness fixes onto master as a single linear squash commit
  • resolve the master/dev divergence by taking the fixed dev tree for conflicted files
  • keep the promotion commit free of merge commits for the master linear-history ruleset

Why this path

Direct dev -> master fast-forward is not viable: master and dev have diverged, and dev contains merge commits that master branch protection rejects. This branch starts from origin/master and squashes the fixed dev tree onto it.

Verification

  • final promotion tree has no diff from fix/dev-master-promotion-readiness (a1459c9)
  • git rev-list --count --merges origin/master..HEAD => 0
  • git diff --check HEAD~1..HEAD
  • npm test (239 files, 2355 passed, 1 skipped) on the matching source tree
  • npm run build on the matching source tree

Pair PR

Notes

  • Windows PowerShell smoke execution was not run locally because this machine does not have pwsh; workflow/static tests cover the wiring and script shape.

@icebear0828 icebear0828 merged commit 045b1cc into master May 22, 2026
2 checks passed
@icebear0828 icebear0828 deleted the promote/dev-to-master-20260522 branch May 22, 2026 09:19
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