Uh oh!
There was an error while loading. Please reload this page.
docs: remove stray merge-conflict markers from lessons-learned.md - #1602
Merged
Conversation
Left behind when the #1492 (serializer convergence) branch was merged with main on 2026-09-01 — the keep-both resolution dropped the <<<<<<< line but not the ======= and >>>>>>> lines. Content on both sides is intact; this only deletes the two marker lines. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NbysMBdkFuycRE3vun3AE6
Uh oh!
There was an error while loading. Please reload this page.
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 freeto 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.
Two conflict-marker lines (
=======,>>>>>>> origin/main) were left incodev/resources/lessons-learned.mdwhen PR #1492 was merged with main on 2026-09-01 (my keep-both resolution dropped only the<<<<<<<line). Both sides' content is intact; this deletes just the two marker lines. Spotted by claude's integration review of #1511, which would otherwise have carried the fix.🤖 Generated with Claude Code
https://claude.ai/code/session_01NbysMBdkFuycRE3vun3AE6