|
|
|
|
|
|
by samuelstros
144 days ago
|
|
|
Merge algebra is similar to git with a three way merge. Given that lix tracks individual changes, the three way merge is more fine grained. In case of a conflict, you can either decide to do last write wins or surface the conflict to the user e.g. "Do you want to keep version A or version B?" The SQL engine is merge unrelated. Lix uses SQL as storage and query engine, but not for merges. |
|
|