Skip to content

Git merge conflict tag detection #6

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

Open
morganrowse opened this issue Nov 9, 2018 · 0 comments
Open

Git merge conflict tag detection #6

morganrowse opened this issue Nov 9, 2018 · 0 comments

Comments

@morganrowse
Copy link
Contributor

I think it would be helpful to detect when a user forgets to remove a git merge conflict tag like below:

$myCoolArray = [
    'first_name' => 'Bob',
<<<<<<< HEAD
    'last_name' => 'Henry',
=======
    'last_name' => 'Smith',
>>>>>>> master
];

It looks like this sniff will be added in a future version of phpcs as seen in the link below.

squizlabs/PHP_CodeSniffer@c961b32

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

No branches or pull requests

1 participant