Context
master is the repository's default and canonical branch (flipped 2026-05-27); all current work, including the graduation-thesis deliverables (PRs #225/#226/#227), lands on master. main is a legacy divergent line that has been intentionally deferred across sessions because reconciling it is a potentially destructive decision that needs review to avoid code loss.
Current state (as of 2026-06-14)
origin/main is 388 commits behind and 145 commits ahead of origin/master.
- The 145
main-only commits span 2026-04-18 → 2026-06-01.
- Top changed areas:
verify-widget (41), archive (19), scripts (16), landing-website (14), bys-demo (8), .claude (6), auth-test (5), .github (2), plus a long run of spoof-detector submodule bumps.
- Several look superseded by later
master work (e.g. chore(merge): reconcile master into main (2026-05-11), branch-protection chores, spoof-detector bumps master also carries), but this is unverified.
Why this is open, not auto-fixed
Merging 145 unique commits in either direction risks dropping in-flight unique work. The 145 main-only commits must be triaged first (superseded vs genuinely unique) before any merge/rebase/abandon.
Decision needed
- Retire
main — accept master as the single line; capture a safety/main-archive-2026-06-14 tag, then abandon main. (Lowest effort; recommended if the 145 commits are all superseded.)
- Reconcile — review the 145
main-only commits, cherry-pick/merge genuinely-unique work into master, then fast-forward main to master.
Acceptance criteria
Not blocking
The thesis is fully on master and current; this does not block submission. Tracking for later cleanup.
Context
masteris the repository's default and canonical branch (flipped 2026-05-27); all current work, including the graduation-thesis deliverables (PRs #225/#226/#227), lands onmaster.mainis a legacy divergent line that has been intentionally deferred across sessions because reconciling it is a potentially destructive decision that needs review to avoid code loss.Current state (as of 2026-06-14)
origin/mainis 388 commits behind and 145 commits ahead oforigin/master.main-only commits span 2026-04-18 → 2026-06-01.verify-widget(41),archive(19),scripts(16),landing-website(14),bys-demo(8),.claude(6),auth-test(5),.github(2), plus a long run ofspoof-detectorsubmodule bumps.masterwork (e.g.chore(merge): reconcile master into main (2026-05-11), branch-protection chores, spoof-detector bumps master also carries), but this is unverified.Why this is open, not auto-fixed
Merging 145 unique commits in either direction risks dropping in-flight unique work. The 145
main-only commits must be triaged first (superseded vs genuinely unique) before any merge/rebase/abandon.Decision needed
main— acceptmasteras the single line; capture asafety/main-archive-2026-06-14tag, then abandonmain. (Lowest effort; recommended if the 145 commits are all superseded.)main-only commits, cherry-pick/merge genuinely-unique work intomaster, then fast-forwardmaintomaster.Acceptance criteria
main-only commits into superseded vs genuinely-uniquemain(with archive tag) or merge unique work intomaster+ syncmainmainNot blocking
The thesis is fully on
masterand current; this does not block submission. Tracking for later cleanup.