4 ms·
> [Kernel] Recognize merge conflict markers in source and provide a readable error message Great idea, having to track down a merge conflict that may have been
by securingsincity 10y ago
> [Kernel] Recognize merge conflict markers in source and provide a readable error message
Great idea, having to track down a merge conflict that may have been committed can be a drag.
- zegerjan 10y agoThis confuses me, as I can think of any language where `<<<<<<HEAD` would be valid? This is why its formatted this way. I'd say the compiler or interpreter should tell you within no time where it encountered invalid tokens?
- lostcolony 10y agoThe point of this change is to make the error message, when the compiler encounters such a line, something like "Unresolved merge conflict detected in source code at (file:line)", rather than whatever it previously was (some sort of nebulous syntax error, that may or may not have been well located, depending on exactly what the parser managed to infer, but certainly was not well defined).