WordPress/WordPress-Coding-Standards
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress-Coding-Standards.git synced 2025-08-30 03:11:24 +08:00
Code Issues Projects Packages Wiki Activity Actions 1

Core: add the Generic.VersionControl.GitMergeConflict sniff

Browse source 
Fixes 1500
This commit is contained in:
jrfnl 2020-04-11 09:57:09 +02:00
parent 16ed111ed4
commit 664adf643a
No known key found for this signature in database
GPG key ID: 88BCD0973A23BCC6
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
WordPress-Core/ruleset.xml
View file

@ -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.