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.

Sign up for GitHub

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

Jump to bottom

Add validation for PR Conflicts #23

Open
sashas777 opened this issue Feb 11, 2021 · 0 comments
Open

Add validation for PR Conflicts #23

sashas777 opened this issue Feb 11, 2021 · 0 comments
Labels
enhancement New feature or request

Comments

@sashas777
Copy link
Owner

Add check (maybe via grep) for merge conflict markers to js, css, sass, phtml, and html files in case a developer was resolving a merge conflict and forgot a chunk:
^<<<<<<< ., ^>>>>>>> .
and ^=======$
@sashas777 sashas777 added the enhancement New feature or request label Mar 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@sashas777