Dolt is Git for Data

Somewhat unrelated but...

    docs $ dolt conflicts cat docs
    +-----+--------+----+----+
    |     |        | pk | c1 |
    +-----+--------+----+----+
    |     | base   | 1  | 1  |
    |  *  | ours   | 1  | 10 |
    |  *  | theirs | 1  | 0  |
    +-----+--------+----+----+

For some reason my brain just can't seem to remember what's "ours" and what's "theirs" when resolving merge conflicts. Like which one represents what was in the working copy and which one represents the data I'm trying to merge. I'd much prefer absolute terms rather than those relative ones.

Yeah I'm kinda the same way. Ultimately we decided to copy git's terminology for this rather than making users learn new terms.

(ours is the working copy, theirs is the thing you're merging in)

Yeah I totally get keeping the nomenclature given Dolt tries to be Git-like.