Skip to content

Git merge conflict tag detection #6

@morganrowse

Description

@morganrowse

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions