docs(skill): record the conflicted-.gitignore hazard from the v0.38.0 fan-out#254
Merged
Merged
Conversation
… fan-out yohou's .gitignore came out unmerged because the project had added reviews/ to the same block the template removed. Three independent signals reported the repo clean and all three were wrong: copier exited 0, the .rej sweep found nothing, and git status did not list the newly-delivered CLAUDE.md -- because the unresolved .gitignore still contained CLAUDE.md, so git treated the delivered file as ignored. The file was on disk throughout. .gitignore is the one file whose own conflicted content changes what git status reports, so it can conceal the delivery being verified. The skill now says to sweep for conflict markers as a first-class check rather than a follow-up, and not to treat git status as evidence when .gitignore is among the changed files. Also corrects the _skip_if_exists list, which had not been updated for CLAUDE.md.
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
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.
The v0.38.0 fan-out hit a failure mode the skill did not describe, on yohou.
That project had added
reviews/to the same ignore block the template removed, so.gitignorecame out unmerged. Three independent signals reported the repo clean:All three wrong. The unresolved
.gitignorestill containedCLAUDE.md, so git treated the delivered file as ignored and omitted it fromstatus, while the file sat on disk the whole time. Only a conflict-marker grep caught it..gitignoreis the one file whose own conflicted content changes whatgit statusreports, so it can conceal the very delivery being verified. The skill now says to sweep for markers as a first-class check equal to the.rejsweep, and not to treatgit statusas evidence of delivery when.gitignoreis among the changed files.Also corrects the
_skip_if_existslist, which had not been updated forCLAUDE.md.Both skill mirrors edited identically, as the byte-identity test added in #252 requires.