From fd3eaf69a11ab38a93d256e3c553df59b92339e6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 15 Aug 2025 10:54:40 +0200 Subject: [PATCH] .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 --- .github/workflows/conflict-notify.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/conflict-notify.yml diff --git a/.github/workflows/conflict-notify.yml b/.github/workflows/conflict-notify.yml new file mode 100644 index 0000000000..6a023745f2 --- /dev/null +++ b/.github/workflows/conflict-notify.yml @@ -0,0 +1,22 @@ +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 }}