Skip to content
Merged
Changes from all commits
Commits
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: 20 additions & 2 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
name: Check Merge Fast-Forward Only

permissions:
pull-requests: write

on:
push:
pull_request:
- push
- pull_request_target
- pull_request_review

jobs:
check_merge:
Expand All @@ -27,3 +31,17 @@ jobs:
else
git merge --ff-only ${{ github.sha }}
fi

- name: add labels
uses: actions-ecosystem/action-add-labels@v1
if: failure()
with:
labels: |
needs rebase

- name: comment
uses: mshick/add-pr-comment@v2
if: failure()
with:
message: |
This pull request has conflicts, please rebase.