Martin von Zweigbergk cc15ecf7c7 op log: change "resolve concurrent" to "reconcile divergent" ... "Concurrent" operations are not necessarily actually concurrent, so "divergent" seems like a better name. And "reconcile" seems like a better term for merging them, though we also sometimes use "merge".		2024-08-30 21:56:11 -07:00
..
architecture.md	docs: markdown fixups, mostly to remove links pointing outside docs	2023-08-28 10:43:48 -07:00
concurrency.md	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
conflicts.md	docs: update description of conflicts to be about tree-level conflicts	2023-11-30 14:24:48 -08:00