News for hackers. Stuff that matters.
Re:I'm pleased to announce that Git conflict markers are par... by arjvik on Wednesday November 09, 2022 @05:17PM (#33538801)
Spoiler:

OP defines the functions `<<<<<<<`, `=======`, and `>>>>>>>` to make this work.

Still cool, but shows it has to be intentional, there's no chance that your code will randomly compile cleanly with conflict markers.