3 ms·
Just :) Dealing with merge conflicts is not trivial. So far I know of three different strategies: Automatic with CRDTs, but there is a price to pay in storage
by zimbatm 9y ago
Just :) Dealing with merge conflicts is not trivial. So far I know of three different strategies:
Automatic with CRDTs, but there is a price to pay in storage and available data-structures to play with.
Manual, like Git.
Denial, aka. Last Write Wins. With is probably good enough for a cache but has been used in other context.