Repository navigation
Run check-merge-drops, failing on a merge that drops content - #164
Open
d-morrison wants to merge 1 commit into
Open
d-morrison wants to merge 1 commit into
d-morrison wants to merge 1 commit into
Conversation
A conflict resolved by keeping one side of a whole file has silently dropped definitions, citations and code from the notes before. gha's check-merge-drops (gha#958) catches that, but no notes repo called it. This adds the consumer workflow from gha's example, with fail: true. Part of Morrison-Lab/ai-config#5408. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019xfc9rEXHYxA5DCp2TL1oG
Contributor
|
Claude finished review — View run I fetched PR #164 live just now. It is open, not a draft, and not merged, and its head is still VerdictReady for merge Structured Review Data (JSON){
"schema_version": "1.1",
"reviewer": "claude",
"commit_sha": "93726044cc2145f9d09da38c5fb052cdb84aa42b",
"verdict": "CLEAN",
"findings": [],
"detailed_assessment": "The new check-merge-drops.yml caller matches the gha example, uses the existing fail input, and pins @v3 like sibling workflows.",
"holistic_assessment": "A single-file CI addition with explicit read-only permissions and no content, math, or dependency changes, so regression risk is minimal."
}Reviewed commit: 9372604 |
Contributor
Contributor
Built to branch |
This branch has not been deployed
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
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.
Requested by Ezra · project thread
Part of Morrison-Lab/ai-config#5408.
Why
Resolving a merge conflict by keeping one side of a whole file has silently dropped definitions, citations and code from the notes before.
gha's
check-merge-drops(Morrison-Lab/gha#958) flags a merge commit whose tree lacks lines either parent added since the merge base, but on 2026-11-12 none of the notes repos (lds, mds, pds, sds, mcs, psw, psc) called it.What changes
One new file,
.github/workflows/check-merge-drops.yml: the consumer from gha'sexamples/check-merge-drops.yml, pinned at@v3, with two changes:fail: true, so a merge that drops content fails CI instead of only writing a warning to the job summary.permissions: contents: readon the calling job, which is what the reusable workflow requests and whatcheck-caller-permissionsexpects.On a pull request it checks only the merges the PR adds (such as a merge of
maininto the branch); on a push tomain, the merges the push brought in.A PR with no merge commits passes trivially.
Expected effect
A dry run of the checker (default
globs,min-lengthandsimilarity) over the last 300 commits on ldsmain(281 merges) flagged 3 merges, each dropping one line.At least one was deliberate: a bullet removed on a branch that converted bullets to prose.
So with
fail: true, a deliberate drop will fail this check about once in a hundred merges, and needs a "merge anyway" from Ezra.Making it a required status check is a branch-ruleset setting, which this PR does not change.
Not done
main, which marks the repo's other open PRs stale for the runner's checker; merge it after the content PRs in the queue.Generated by Claude Code