chore: apply template copier-ssf-ci at v1.7.0

Author: dafyddj

.copier-answers.ssf-ci.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v1.6.3
+_commit: v1.7.0
 _src_path: https://github.com/dafyddj/copier-ssf-ci
 failure_permitted_pattern: (?x)(-master$|^fedora-41-|^amazonlinux-2-)
 formula_name: openssh

.pre-commit-config.yaml

@@ -17,6 +17,13 @@ ci:
   submodules: false
 default_stages: [pre-commit]
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-merge-conflict
+        name: Check for Git merge conflicts
+        args: [--assume-in-merge]
+        exclude: ^docs/AUTHORS.rst$
   - repo: https://github.com/dafyddj/mirrors-commitlint
     rev: v19.8.1
     hooks:

commitlint.config.js

@@ -6,7 +6,9 @@ module.exports = {
         'header-max-length': [2, 'always', 72],
     },
     ignores: [
+        (commit) => commit.startsWith("chore(copier):"),
         (commit) => commit.startsWith("chore(deps):"),
+        (commit) => commit.startsWith("ci(pre-commit.ci):"),
         (commit) => commit.startsWith("[CI merge]")
     ],
 };