chore: purge iCloud sync-conflict files and block future ones#88
Merged
Conversation
Five iCloud Drive sync-conflict copies (" 2" suffix) had been committed to
main; the canonical originals are current and these are stale artifacts:
- .coderabbit 2.yaml, CONTEXT 2.md, arch-review 2.md, and two
forerunner-arch-review SKILL 2.md copies
Remove them, ignore the naming pattern (and .icloud placeholders) in
.gitignore so `git add .` can't restage them, and add a CI guard that
fails the build if any " <digits>" conflict file is ever tracked again.
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.
Problem
Five iCloud Drive sync-conflict copies (the
" 2"suffix iCloud adds on a conflict) were committed tomain. A full repo sweep (tracked + on-disk, all digit suffixes, directories,.icloudplaceholders, Dropbox-style markers) found exactly these five and nothing else:.coderabbit 2.yamlCONTEXT 2.mdsrc/codeforerunner/prompts/tasks/arch-review 2.mdplugins/codeforerunner/skills/forerunner-arch-review/SKILL 2.mdskills/forerunner-arch-review/SKILL 2.mdThree were byte-identical to their originals; the two that differed (
.coderabbit,CONTEXT.md) had stale conflict content — the canonical (non-" 2") files are the current ones (they carry the recentreview_status: falseand Socket-badge edits). All five canonical originals remain intact.Fix
.gitignore: ignore* [0-9].*,* [0-9], and*.icloudsogit add .can never restage a conflict copy or placeholder.ci.yml: a guard step fails the build if any" <digits>"conflict file is ever tracked again — defends against a forcedgit add -f.Verification
git check-ignore "probe 2.md" "probe 2"→ both ignored.🤖 Generated with Claude Code