From 93726044cc2145f9d09da38c5fb052cdb84aa42b Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 12 Nov 2026 12:01:20 +0000 Subject: [PATCH] Run check-merge-drops, failing on a merge that drops content 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 Claude-Session: https://claude.ai/code/session_019xfc9rEXHYxA5DCp2TL1oG --- .github/workflows/check-merge-drops.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/check-merge-drops.yml diff --git a/.github/workflows/check-merge-drops.yml b/.github/workflows/check-merge-drops.yml new file mode 100644 index 00000000..d04c172d --- /dev/null +++ b/.github/workflows/check-merge-drops.yml @@ -0,0 +1,22 @@ +# Reports content a merge commit silently dropped: lines either side added +# since the merge base that appear nowhere in the merge's tree -- what +# resolving a conflict by keeping one side of a whole file looks like. +# Copied from Morrison-Lab/gha's examples/check-merge-drops.yml, with +# `fail: true` so such a merge fails CI instead of only warning +# (Morrison-Lab/ai-config#5408). +name: Check merge commits for dropped content + +on: + push: + branches: + - main + pull_request: + workflow_dispatch: + +jobs: + check: + permissions: + contents: read + uses: Morrison-Lab/gha/.github/workflows/check-merge-drops.yml@v3 + with: + fail: true