I'm curious about merging. When there is a conflict, like when a file gets chang... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		billconan on Aug 3, 2016 \| parent \| context \| favorite \| on: Show HN: Noms – A new decentralized database based... I'm curious about merging. When there is a conflict, like when a file gets changed by different people, how merging is performed?

aboodman on Aug 5, 2016 [–]

Not implemented yet, but here is the plan: https://github.com/attic-labs/noms/issues/148

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact