Core: add the Generic.VersionControl.GitMergeConflict sniff

Fixes 1500
WordPress · Apr 22, 2022 · 664adf6 · 664adf6
1 parent 16ed111
commit 664adf6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
@@ -523,6 +523,9 @@
 		<message>Best practices: Declare only one class/interface/trait in a file.</message>
 	</rule>
 
+	<!-- Error on merge conflict markers. -->
+	<rule ref="Generic.VersionControl.GitMergeConflict"/>
+
 	<!--
 	#############################################################################
 	Not in the coding standard handbook: WP specific sniffs.