chore: reconcile local main with origin (merge conflict resolution) - #13
Merged
Conversation
StevenMih
force-pushed
the
chore/reconcile-local-main
branch
from
July 31, 2026 23:54
e830696 to
3ba600c
Compare
Resolves the 3-commits-ahead/13-behind divergence flagged in [site-deploy-push]. Squashed to avoid carrying forward unsigned historical commits into the DCO-gated main branch. - docs/bilateral.html, ip.html, sitemap.xml: took origin's versions (neutral verify domain, current bilateral page from PR #11, complete sitemap) over the stale pre-architecture-pass local content. - docs/governance.html, docs/index.html, index.html: picked up 3 small additive footer/sidebar links (Governance, Patent posture) from local commit 34017a1 that never made it into the architecture-pass PR. Purely additive, links to already-live pages. Signed-off-by: stevenmih <stevenmih88-3@gmail.com>
StevenMih
force-pushed
the
chore/reconcile-local-main
branch
from
July 31, 2026 23:58
3ba600c to
c10a4eb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves the 3-commits-ahead/13-behind divergence flagged in [site-deploy-push]. Local main had stale pre-architecture-pass content for docs/bilateral.html and ip.html (old vendor verify domain) — resolved by taking origin's versions (neutral domain, current bilateral page from PR #11). sitemap.xml conflict resolved the same way. Also picks up 3 small additive footer-link changes (Governance + Patent posture links) from local commit 34017a1 that never made it into the architecture-pass PR — purely additive, links to already-live pages.