fix(docs): align MODULE-SYSTEM-PROGRESS with main — clears #614 conflict#616
Merged
hyperpolymath merged 1 commit intoJun 21, 2026
Conversation
… conflict #615 was squash-merged, which carried main's content into the feature branch but not its ancestry, so #614's 3-way merge re-derived a modify/delete conflict on docs/history/MODULE-SYSTEM-PROGRESS (main modified the .md in #602; this branch had migrated it to .adoc). Resolve squash-robustly by matching main exactly for this file: restore main's .md and drop the .adoc. No content is lost — main's .md already carries the #138 codegen-follow-up note. The .md->.adoc migration can be redone later as a standalone DOC-FORMAT change. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Lz7pRcec2Z3tVtaAhvB3M8
hyperpolymath
merged commit 6fbdb9a
into
feat/solo-core-metatheory-proofs
2 of 3 checks passed
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.
What
Clears the last merge conflict blocking #614. After #615 was squash-merged, the feature branch gained
main's content but not its ancestry, so #614's 3-way merge re-derived one conflict:docs/history/MODULE-SYSTEM-PROGRESS(modified onmainin #602 / migrated to.adoc+ deleted on this branch).Fix
Match
mainexactly for that one file — restoremain's.md, drop the.adoc. No content is lost:main's.mdalready carries the #138 codegen-follow-up note. The.md→.adocmigration can be redone later as a standalone DOC-FORMAT change.This resolution is squash-robust — it makes the file modify/modify-identical rather than modify/delete, so #614 stays conflict-free regardless of how this PR is merged.
Verified
main: 0 conflicts ("Automatic merge went well").dune buildclean (docs-only delta from the already-green Merge main into feat/solo-core-metatheory-proofs (un-block #614) #615 tree —dune test534/534 there).Merging this into
feat/solo-core-metatheory-proofsmakes #614 mergeable and triggers its full CI.🤖 Generated with Claude Code
https://claude.ai/code/session_01Lz7pRcec2Z3tVtaAhvB3M8
Generated by Claude Code