fix: resolve merge conflicts for PR #73 (SSOT alignment)#93
Merged
Conversation
- Hub & Spoke topology added to architecture/a2a.md - Naming conventions guide added to docs/guide/ - Technology sovereignty mandate added to best-practices/security.md - Manual conflict resolution for security.md (appended mandate section)
This was referenced Apr 14, 2026
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.
Summary\n\nThis PR resolves the merge conflicts in PR #73 (SSOT alignment — Hub & Spoke, Banned Tech, Naming).\n\n### Changes applied from original PR #73:\n- docs/architecture/a2a.md — Added Hub & Spoke fleet topology section with Mermaid diagram\n- docs/guide/naming-conventions.md — Added naming conventions guide (new file)\n- docs/best-practices/security.md — Added Technology Sovereignty Mandate for browser automation\n\n### Conflict Resolution:\n- Original PR had a rejected hunk in due to content drift\n- Manually appended the Technology Sovereignty Mandate to the end of the file\n- All changes are preserved and conflict-free\n\n### Next Steps:\nOnce this is merged, PR #73 can be closed as superseded.