docs(agents): the gates are green on a tree that cannot be merged #146

Merged

jlxq0 merged 1 commit from conflicted-tree-gate into main

2026-08-29 16:39:02 +00:00

jlxq0 commented

2026-08-29 16:37:19 +00:00

Owner

Five gates passed on a working tree holding an unresolved AGENTS.md conflict. Markers in a markdown file compile and test like any other text, so fmt, clippy -D warnings, 312 passed, audit and deny all went green while merging was impossible. Nothing in their output hints at it, and the markers can be git added and committed, so trusting the gates there pushes a conflicted branch and calls it verified.

Caught only because I was watching the merge rather than the gates.

The collision is structural, not bad luck. Every entry in that file is appended at the end, so any two branches that both add one will conflict, and it is the file this repository asks everybody to touch after a bug.

The commands, measured rather than repeated

git diff --name-only --diff-filter=U     prints the paths, exits 0 — test the output
git ls-files -u                          one line per unmerged stage, empty when clean
git diff --check                         names the marker lines, exits 2

git diff --check exits 2, not 1, and it also fires on whitespace errors, so a non-zero exit from it is not specifically a conflict. Verified in a scratch repository rather than assumed.

The check ran before the gates on this very branch, which is the only reason this PR is not itself an instance.

Gates: fmt, clippy -D warnings, 312 passed; 0 failed.

**Five gates passed on a working tree holding an unresolved `AGENTS.md` conflict.** Markers in a markdown file compile and test like any other text, so `fmt`, `clippy -D warnings`, `312 passed`, `audit` and `deny` all went green while merging was impossible. Nothing in their output hints at it, and the markers can be `git add`ed and committed, so trusting the gates there pushes a conflicted branch and calls it verified. Caught only because I was watching the merge rather than the gates. **The collision is structural, not bad luck.** Every entry in that file is appended at the end, so any two branches that both add one will conflict, and it is the file this repository asks everybody to touch after a bug. ## The commands, measured rather than repeated git diff --name-only --diff-filter=U prints the paths, exits 0 — test the output git ls-files -u one line per unmerged stage, empty when clean git diff --check names the marker lines, exits 2 **`git diff --check` exits 2, not 1**, and it also fires on whitespace errors, so a non-zero exit from it is not specifically a conflict. Verified in a scratch repository rather than assumed. The check ran before the gates on this very branch, which is the only reason this PR is not itself an instance. Gates: fmt, clippy `-D warnings`, `312 passed; 0 failed`.

jlxq0 added 1 commit

2026-08-29 16:37:19 +00:00

docs(agents): the gates are green on a tree that cannot be merged

CI / cargo (pull_request) Successful in 1m21s

Details

CI / docker (pull_request) Has been skipped

Details

9ece0a988f

Five gates passed on a working tree holding an unresolved AGENTS.md conflict:
markers in a markdown file compile and test like any other text, so fmt,
clippy, 312 tests, audit and deny all went green while merging was impossible.
Nothing in their output hints at it, and the markers can be added and
committed, so trusting the gates there pushes a conflicted branch and calls it
verified. I caught it only because I was watching the merge rather than the
gates.

The collision is structural rather than bad luck. Every entry in that file is
appended at the end, so any two branches that both add one will conflict, and
it is the file this repository asks everybody to touch after a bug.

The commands are measured rather than repeated. git diff --check names the
marker lines and exits 2 rather than 1, and it also fires on whitespace errors,
so a non-zero exit from it is not specifically a conflict. git diff
--name-only --diff-filter=U prints the paths and exits 0, so it has to be
tested by its output. git ls-files -u is the precise unmerged-stage check.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FEgtox6vnEkYPv9PrCCoYG

jlxq0 merged commit 4df283002c into main

2026-08-29 16:39:02 +00:00

jlxq0 deleted branch conflicted-tree-gate

2026-08-29 16:39:02 +00:00

jlxq0 referenced this pull request from a commit

2026-08-29 16:39:02 +00:00

Merge pull request 'docs(agents): the gates are green on a tree that cannot be merged' (#146) from conflicted-tree-gate into main