Conflict: A small esoteric language giving semantics to Git merge conflictgithub.com1 point·andybak··0 commentsOpen articleSaveView on HN