fix(repo): resolve bleeding-edge gitmodules conflict markers#269
Merged
Conversation
Record plan 020 for resolving merge conflict markers on bleeding-edge and mark plan 019 completed after PR #268 merge.
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
Add verification table for PR #268 merge and pending PyPI regression run.
Document R1-R4 evidence: fix f15e476 on origin/bleeding-edge, parse validation, and forward-commits re-run status.
27 tasks
27 tasks
github-actions Bot
pushed a commit
that referenced
this pull request
May 24, 2026
* docs(plans): add bleeding-edge gitmodules fix plan Record plan 020 for resolving merge conflict markers on bleeding-edge and mark plan 019 completed after PR #268 merge. * docs(plans): record post-merge verification for plan 019 Add verification table for PR #268 merge and pending PyPI regression run. * docs(plans): finalize pypi regression post-268 verification * docs(plans): record bleeding-edge gitmodules closeout verification Document R1-R4 evidence: fix f15e476 on origin/bleeding-edge, parse validation, and forward-commits re-run status.
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
Forward Commits to Bleeding-Edge failed after PR #268 because
bleeding-edge.gitmodulesstill had merge conflict markers (<<<<<<< HEAD/>>>>>>> b18669b96), causingfatal: bad config line 56.Fix (already on
bleeding-edge): commitf15e4769dremoves the three marker lines and keeps the HEAD submodule inventory. Validated withgit config -f .gitmodules --listonorigin/bleeding-edge.This PR adds plan documentation and closeout verification only;
master.gitmoduleswas already clean.Requirements
f15e4769donbleeding-edgegit config -f .gitmodules --listbleeding-edgeorigin/bleeding-edgeatf15e4769dTest plan
git show origin/bleeding-edge:.gitmoduleshas no<<<<<<</>>>>>>>git config -f .gitmodules --listsucceeds on bleeding-edge treePlans
docs/plans/2026-05-24-020-fix-bleeding-edge-gitmodules-plan.md(closeout verification in latest commit)