An alternative to operational transformations in collaborative software are data types named for being “[this word]-free.” For 10 points each:
[10m] Name this word, which also describes a situation that occurs when attempting to use the “git merge” command on incompatible branches.
ANSWER: conflict [accept merge conflict; accept conflict-free replicated data type; prompt on CRDT]
[10h] Conflict-free replicated data types can be used to implement collaborative text editors with the “strong” form of this two-word property, the requirement that all nodes in a distributed system converge to the same state if no further updates are made.
ANSWER: eventual consistency [or being eventually consistent; accept strong eventual consistency; prompt on consistency or being consistent]
[10e] CRDTs enable collaborative text editors that are “local-first” and avoid using this type of storage. Most collaborative text editors like Google Docs sync to this type of storage, in which data is stored in remote servers accessible via the Internet.
ANSWER: cloud storage [accept cloud computing; prompt on Google Drive by asking “can you be less specific?”]
<Editors, Other Science>