4 ms·
That is not true. Dolt will throw a merge conflict if two cells are modified on two different branches. You still have to pick which one but at least you know.
by timsehn 6y ago
That is not true. Dolt will throw a merge conflict if two cells are modified on two different branches. You still have to pick which one but at least you know.
- remram 6y agoSo will Git. My problem is if that specific cell was not 'na' when the batch change was applied. In that case, there is no conflict. If those were SQL transaction, one would abort and re-try, giving you the correct result. Even when using a transaction model as simple as Redis, you would get a conflict if you issued the correct `WATCH` statements.