From 1d369f45745e43933454d6eaec58c90365d38dbd Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 24 Jun 2020 01:55:44 -0500
Subject: [PATCH] ci: notify when a PR has a merge conflict.

Adds a "merge conflict" label and posts a comment when a PR has a merge
conflict. See https://github.com/Marr11317/ConflictAdviser#limitations.
---
 .github/workflows/test.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 592dac48b..03a6c2d3f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -10,6 +10,16 @@ on:
     - master
 
 jobs:
+  # https://github.com/Marr11317/ConflictAdviser
+  notify-merge-conflicts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Marr11317/ConflictAdviser@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          conflict_label: "merge conflict"
+          comment: 'Rebase needed'
+
   test:
     runs-on: ubuntu-latest
     container: ubuntu:20.04