Skip to content

Run check-merge-drops, failing on a merge that drops content #164

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

Open
d-morrison wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −0
Open

Run check-merge-drops, failing on a merge that drops content #164

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
22 changes: 22 additions & 0 deletions .github/workflows/check-merge-drops.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading