3 ms·
I'm curious about merging. When there is a conflict, like when a file gets changed by different people, how merging is performed?
by billconan 10y ago
I'm curious about merging.
When there is a conflict, like when a file gets changed by different people, how merging is performed?
- aboodman 10y agoNot implemented yet, but here is the plan: https://github.com/attic-labs/noms/issues/148 https://github.com/attic-labs/noms/issues/148