The claim on the website is not meant to suggest that any two changes can be automatically merged. I will try to clarify that. The world contains logical confl

The claim on the website is not meant to suggest that any two changes can be automatically merged. I will try to clarify that. The world contains logical conflicts because physical constraints mean that processes can operate disconnected from each other. No database can wave that away. Noms will automatically, efficiently, and correctly merge changes that don't logically conflict. Which is a pretty cool and unique property in a database. If any conflicts are found, there is a callback to user software to perform a resolution. More info in the documentation: https://godoc.org/github.com/attic-labs/noms/go/merge https://godoc.org/github.com/attic-labs/noms/go/merge