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
concurrency.md	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
conflicts.md