Resolve merge conflict markers in 7 files#290
Open
seriouscoderone wants to merge 4 commits intoWebOfTrust:mainfrom
Open
Resolve merge conflict markers in 7 files#290seriouscoderone wants to merge 4 commits intoWebOfTrust:mainfrom
seriouscoderone wants to merge 4 commits intoWebOfTrust:mainfrom
Conversation
These files contained <<<<<<< HEAD / ======= / >>>>>>> upstream/main conflict markers that were committed without being resolved. Keeps the upstream/main side in all cases: - 3 annotated-copies files (different auto-generated accordion IDs) - 2 glossary files (self-authenticating.md, streamer.md) - overview-and-context.mdx (auto-generated table data) - overview.json (auto-generated JSON data) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Resolve merge conflict markers in 7 files
…reamer.md Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
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.
Summary
<<<<<<<,=======,>>>>>>>) across 7 files that were left over from a previous mergeTest plan
🤖 Generated with Claude Code