Skip to content

<<<<< in codes - is this broken merge? #2059

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

Closed
interduo opened this issue Jun 11, 2018 · 4 comments
Closed

<<<<< in codes - is this broken merge? #2059

interduo opened this issue Jun 11, 2018 · 4 comments

Comments

@interduo
Copy link

# grep -R '<<<<<<<' *
vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc.fixed:<<<<<<< HEAD
vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc:<<<<<<< HEAD
vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc:<<<<<<< HEAD

Please don't leave that in releases.

@jrfnl
Copy link
Contributor

jrfnl commented Jun 11, 2018

If you would have opened the files, you would have seen these are test cases to make sure the two sniffs handle merge conflicts found in tested code correctly.

Suggest close.

@interduo
Copy link
Author

interduo commented Jun 11, 2018

Is this required to distribiute src code with releases?

Please take a wider look outside only your project. Where Your project takes only a little part of this puzzles.

@gsherwood
Copy link
Member

Is this required to distribiute src code with releases?

You're probably looking for issue #1908, which will remove the tests from the distribution when version 4 is released.

@interduo
Copy link
Author

Thanks a lot. Didnt find that.

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

3 participants