github-actions(pre-commit): detect merge conflicts and shebangs (#6563) (#6569)

Author: mergify[bot]

.github/workflows/pre-commit.yml

@@ -0,0 +1,18 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - 8.*
+      - 9.*
+
+permissions:
+  contents: read
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: elastic/oblt-actions/pre-commit@v1

.pre-commit-config.yaml

@@ -1,9 +1,10 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.6.0
     hooks:
     -   id: check-executables-have-shebangs
         exclude: (.*/.*.(ps1|bat|bash)$)
     -   id: check-shebang-scripts-are-executable
         exclude: (.*/.*.(tmpl|tftpl)$)
     -   id: check-merge-conflict
+        args: ['--assume-in-merge']