Skip to content

Repair master: three conflict markers in SKILL.md #3076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gHashTag merged 1 commit into from
Sep 3, 2026
Merged

Repair master: three conflict markers in SKILL.md #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .claude/skills/ci-gates/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12727,7 +12727,6 @@ covered this branch, which is the same fact the docstring got wrong, restated in
form that fails if someone deletes it.


<<<<<<< HEAD
## 479. An optional qualifier over an empty population

`grep -oE '(issue-|#)?[0-9]+'` extracts an issue number from a branch name. The
Expand Down Expand Up @@ -12782,8 +12781,9 @@ distinction matters enough to argue about. This repository has converged on
one distinction: *the instrument is missing* and *the population is empty* share
a code here and have different codes there. Worth knowing before the next gate
picks a number.
=======
## 479. The check said no and I pushed anyway


## 480. The check said no and I pushed anyway

Two things happened an hour apart, and only the second one is a lesson.

Expand Down Expand Up @@ -12826,4 +12826,3 @@ in this file about a gate reporting the wrong subject is about a machine doing
it. This one is about me: the instrument was correct, its message was correct,
and the failure was entirely in the reading. **Instruments that only print are
sized for a reader who is not tired.**
>>>>>>> origin/master
19 changes: 19 additions & 0 deletions docs/now/2026-09-04-a-conflict-marker-reached-master.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# NOW -- A conflict marker reached master (2026-09-04)

## Three markers in SKILL.md, put there by my own PR

- `.claude/skills/ci-gates/SKILL.md` carried `<<<<<<< HEAD`, `=======` and
`>>>>>>> origin/master` at lines 12730, 12785 and 12829 on master, merged in
#3072.
- Cause: an automated conflict resolution of mine handled
`.github/workflows/untrusted-input-gate.yml` and then ran `git add -A` and
committed. The conflict that time was in SKILL.md, and the markers went with
it. Both sides were my own sections, both numbered 479.
- Repaired by keeping both and renumbering the second to 480. Asserted: zero
anchored markers, unique and ascending numbers, no duplicate titles.
- `tools/check_conflict_markers.py` DID see it -- "conflict marker on line
12730, 12829" -- so the instrument was right and the merge happened anyway.
- The guard now in the procedure, and it stopped the next commit an hour later:
`git diff --cached --name-only | xargs grep -l '^<<<<<<<'`, anchored at line
start because this file legitimately quotes the marker in prose. A substring
test refused a clean file over its own documentation on the first attempt.
Loading