Repair master: three conflict markers in SKILL.md - #3076
Merged
Conversation
Closes #3075 .claude/skills/ci-gates/SKILL.md carried <<<<<<< HEAD, ======= and >>>>>>> origin/master at lines 12730, 12785 and 12829, merged in #3072. Mine. An automated conflict resolution handled .github/workflows/untrusted-input-gate.yml and then ran `git add -A` and committed; that conflict was in SKILL.md and the markers went with it. Both sides were my own sections, both numbered 479 -- kept, with the second renumbered to 480. tools/check_conflict_markers.py saw it and said so. The instrument was right and the merge happened regardless. Asserted here: zero anchored markers, numbers unique and ascending, no duplicate titles.
gHashTag
enabled auto-merge (squash)
September 3, 2026 23:10
gHashTag
added a commit
that referenced
this pull request
Sep 3, 2026
This branch owns no skill section; master's copy carried the three conflict markers from #3072, so the repaired copy is used rather than propagating them.
Contributor
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
This was referenced Sep 3, 2026
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.
Closes #3075
On master right now
in
.claude/skills/ci-gates/SKILL.md, merged by #3072 (e35f8f619). Mine.Cause
An automated conflict resolution of mine handled
.github/workflows/untrusted-input-gate.yml, then rangit add -Aand committed. That merge's conflict was inSKILL.md, and the markers went in with it.Both sides are my own sections, both numbered 479 — "An optional qualifier over an empty population" and "The check said no and I pushed anyway". Kept, with the second renumbered to 480.
The instrument was right
tools/check_conflict_markers.pyreports it verbatim: "conflict marker on line 12730, 12829 … A conflict marker is a broken file, not a formatting question." The detector worked and the merge happened regardless.Asserted
check_conflict_markers.pyonSKILL.mdThe guard now in the procedure
Scoped to the files being committed rather than the tree —
scripts/verify_all_152.pycarries pre-existing markers, so a tree-wide check would be useless — and anchored at line start, because this file legitimately quotes<<<<<<<in prose and a substring test refused a clean file over its own documentation on the first attempt.It has already stopped one commit since.