Email or username:

Password:

Forgot your password?
Stefan Eissing

It's better to solve the merge conflicts later than never to have coded at all!

1 comment
Johan Wärlander 🦀

@icing We need a programming language where the merge conflict markers are valid syntax, and means that one of the options will be picked at random.

Alternatively, the compiler may try permutations of the combined code until it becomes a valid program, the final version only existing in the resulting binary.

Go Up