Hacker News Reader

Indeed. So conflict resolution that takes input from the user needs to be part of the protocol. Just like in Git.

or from the LLM. It can't be super complicated to describe a logic schema to do a merge like that. It's just a business logic vs universal logic.