Skip to content

Detect git merge conlict markers #60151

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
Closed
bjorn3 opened this issue Apr 21, 2019 · 2 comments
Closed

Detect git merge conlict markers #60151

bjorn3 opened this issue Apr 21, 2019 · 2 comments

Comments

@bjorn3
Copy link
Member

bjorn3 commented Apr 21, 2019

They could be handled by either stopping with parsing immediately after finding one to prevent meaningless errors or by choosing one side and parse as if the conflict has been resolved by the user by choosing that side.
@jonas-schievink
Copy link
Contributor

Duplicate of #32059

@jonas-schievink jonas-schievink marked this as a duplicate of #32059 Apr 21, 2019
@bjorn3
Copy link
Member Author

bjorn3 commented Apr 21, 2019

I did search for an already existing one, but couldn't find it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@jonas-schievink @bjorn3