Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Generic.VersionControl.GitMergeConflict #486

Merged
merged 1 commit into from
Jul 3, 2020

Conversation

GaryJones
Copy link
Contributor

@GaryJones GaryJones commented Jul 3, 2020

Removes WordPressVIPMinimum.VersionControl.MergeConflict sniff.

The merge conflict boundary detection sniff in the built-in Generic standard is a more comprehensive sniff, and it means one less thing for VIP to maintain.

Requires PHPCS 3.4+ (made a requirement in #484).

Fixes #330.

Failures in ruleset tests for PHP 7.4, or testing against PHPCS 3.3.1, will be addressed once #484 and #485 have been merged.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Removes WordPressVIPMinimum.VersionControl.MergeConflict sniff.

The merge conflict boundary detection sniff in the built-in Generic standard is a more comprehensive sniff, and it means one less thing for VIP to maintain.

Requires PHPCS 3.4+ (made a requirement in #484).

Fixes #330.
@GaryJones GaryJones added this to the 2.1.0 milestone Jul 3, 2020
@GaryJones GaryJones requested a review from rebeccahum July 3, 2020 15:23
@rebeccahum rebeccahum merged commit 6d739b6 into develop Jul 3, 2020
@rebeccahum rebeccahum deleted the feature/remove-merge-conflict-sniff branch July 3, 2020 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PHPCS 3.4.0: Remove MergeConflictSniff, use Generic.
2 participants