Complain about unresolved merge conflicts

Author: tvdijen

.github/workflows/php.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.1
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.1
     with:
       enable_eslinter: false
       enable_jsonlinter: true

phpcs-simplesamlphp.xml

@@ -9,6 +9,9 @@
   <!-- Do not allow unnecessary spaces inside arbitrary parentheses -->
   <rule ref="Generic.WhiteSpace.ArbitraryParenthesesSpacing" />
 
+  <!-- Complain about unresolved merge conflicts -->
+  <rule ref="Generic.VersionControl.GitMergeConflict" />
+
   <config name="installed_paths" value="vendor/slevomat/coding-standard"/>
 
   <!-- Use fully qualified class names in annotations and PHPdoc -->