workflow: find merge conflicts

since mergify creates commits with merge conflicts, having a check that calls out the conflict can be helpful in cases where the conflict doesn't otherwise break the build.

Author: yaauie

.github/workflows/find-merge-conflicts.yml

@@ -0,0 +1,27 @@
+on: [push]
+
+jobs:
+  merge_conflict_job:
+    runs-on: ubuntu-latest
+    name: Find merge conflicts
+    steps:
+      # Checkout the source code so we have some files to look at.
+      - uses: actions/checkout@v2
+      # Run the actual merge conflict finder
+      - name: Merge Conflict finder
+        uses: olivernybroe/[email protected]
+        with:
+          # skip known build-related dirs
+          exclude_dir: >-
+            build
+            vendor
+            logstash-core/build
+            logstash-core/lib/jars
+          # skip known binary files
+          excludes: >-
+            *.jar
+            *.p12
+            *.png
+            *.svg
+            *.tgz
+            *.zip