Files
xserver/.github/workflows/conflict-notify.yml
Enrico Weigelt, metux IT consult fd3eaf69a1 .github: notify on merge conflicts in PRs
Add a pipeline that's checking for and notifying on merge conflicts
within open pull requests. It's triggered whenever one of the baseline
branches (eg. master, maint-*, etc) are pushed.

Unfortunately, we don't have any way for rate limiting within a single
PR yet, so on a day with lots of merges, it could become a bit spammy.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-08-18 10:51:09 +02:00

23 lines
472 B
YAML

name: check PRs for merge conflicts
on:
push:
branches:
- master
- 'maint-*'
- 'rfc/new-abi*'
permissions:
pull-requests: write
jobs:
notify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: nokamoto/merge-conflict-action@v0.0.4
with:
owner: X11Libre
repo: xserver
token: ${{ secrets.GITHUB_TOKEN }}