Skip to content

merge(main): absorb previous promotion merge commit — unblock promotion - #11806

Merged
mrveiss merged 2 commits into
Dev_new_guifrom
hotfix-backmerge-main2
Jul 16, 2026
Merged

mrveiss merged 2 commits into
Dev_new_guifrom
hotfix-backmerge-main2

Conversation

@mrveiss

@mrveiss mrveiss commented Jul 16, 2026

Copy link
Copy Markdown
Owner

Part of the owner-approved second promotion (2026-07-16).

Thinking Path

main's only commit not on Dev_new_gui is yesterday's promotion MERGE COMMIT 847f0ed itself (both its parents are ancestors — zero unique content). -s ours back-merge restores ancestry so the promotion PR merges cleanly. Same process as #11768.

What Changed

  • Merge commit only: git diff origin/Dev_new_gui..HEAD is empty.

Verification

  • Zero content delta (ours strategy); MUST merge with a MERGE COMMIT (squash kills the ancestry this exists for).

Model Used

Claude Fable 5

mrveiss added 2 commits July 15, 2026 21:16
Promote Dev_new_gui → main (2026-07-15 tech-debt drain + dependabot targeting fixes)
@mrveiss
mrveiss merged commit b28e711 into Dev_new_gui Jul 16, 2026
17 checks passed
@mrveiss
mrveiss deleted the hotfix-backmerge-main2 branch July 16, 2026 21:17
@github-actions

Copy link
Copy Markdown
Contributor

✅ SSOT Configuration Compliance: Passing

🎉 No hardcoded values detected that have SSOT config equivalents!

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