Make the compiler resilient to encountering merge conflict markers in a source code file. #1456
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/compiler/scanner.ts
Outdated
There was a problem hiding this comment.
this is actually a really dumb fallthrough. I'll just make it break.
|
👍 |
CyrusNajmabadi
added a commit
that referenced
this pull request
Dec 12, 2014
Make the compiler resilient to encountering merge conflict markers in a source code file.
|
I kind of wish we had the "Are you in the middle of a merge?" portion for that message. |
kelleyma49
reviewed
Apr 11, 2017
| var ch = text.charCodeAt(pos); | ||
|
|
||
| // All conflict markers consist of the same character repeated seven times. If it is | ||
| // a <<<<<<< or >>>>>>> marker then it is also followd by a space. |
There was a problem hiding this comment.
Probably best to send a patch instead of commenting on a 2-year-old PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.