This repository was archived by the owner on Sep 23, 2026. It is now read-only.
Repository navigation
Merge main into codex/atomic-did-identities (conflict resolution for #19) - #20
Merged
Merged
Conversation
Resolves the two documentation conflicts blocking PR #19. Both were purely additive: the DID paragraph from the PR branch and the passive platform lens section from main were appended at the same position in README.md and docs/atomic-data.md. Both sides are kept; no content from either branch is dropped. Verified on the merged tree: 73/73 tests pass, lint reports 0 errors, tsc --noEmit is clean. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017i9pt9cgeDa2t6BaACAJQF
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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 merge conflicts blocking #19. This branch is a merge commit whose parents are
06badea(the PR #19 head) and698c2c7(currentmain), so it carries the full PR #19 change plusmain.Conflicts resolved
Two documentation conflicts, both purely additive — the PR branch and
maineach appended text at the same position, with no semantic overlap:README.md— the PR branch's DID/native-resource-API paragraph andmain's### Passive platform lensessection.docs/atomic-data.md— the PR branch's DID identifiers paragraph andmain's## Passive platform lensessection.In both files both sides are kept in full. No content from either branch is dropped, and no code files conflicted.
Verification
Run against the merged tree:
pnpm test— 73/73 passing across 15 test filespnpm lint— 0 errors (26 pre-existingexplicit-function-return-typewarnings, unchanged)npx tsc --noEmit— cleanNote on how to land this
The resolution lives on this branch because
codex/atomic-did-identitiesbelongs to another author. If you'd rather keep #19 as the tracking PR, the same merge commit can be pushed straight tocodex/atomic-did-identitiesinstead of merging this PR — it is a merge, not a rewrite, so existing checkouts of that branch stay valid.🤖 Generated with Claude Code
https://claude.ai/code/session_017i9pt9cgeDa2t6BaACAJQF
Generated by Claude Code