basile-henry / conflict Public

Conflict is a small esoteric language that was inspired by all these annoying git merge conflicts that sometime get committed by mistake. What if these merge conflicts actually had meaningful semantics in the execution of the program? It is this question I am attempting to answer with this silly programming language. So what does happen when a merge conflict block is reached? Simple, the main thread is forked in two, where both threads keep on using the same global scope while executing their side of the conflict block. This of course comes with all the concurrency issues one might expect. The rest of the language is loosely based on some flavour of BASIC and is kept as small as possible.

Leave a Comment