Request: SyntaxError message for Merge conflict marker (as detected by TypeScript)

[dilijev]

Typescript has a great error message. When encountering lines generated by a merge conflict (and left in if unresolved or incorrectly resolved):

error TS1185: Merge conflict marker encountered.

Note: This wouldn't be able to detect markers inside of multiline-strings.

/cc @bterlson

[bterlson]

Should detect diff3 format as described here as well: microsoft/TypeScript#16129.

[dilijev]

@bterlson Would detecting this potentially cause a spec violation? I'd assume the presence of such tokens would cause a SyntaxError anyway, so we'd just be giving a helpful message. Just want to make sure.

[dilijev]

Note: This wouldn't be able to detect markers inside of multiline-strings.

[bterlson]

@dilijev no spec violation, still a syntax error just with a nicer message.