4 ms·

And sensible merge conflict resolution vs normal cloud saves.

• pkulak 2y ago
  Yeah, every year or so I get a merge conflict, and then the whole things stops syncing and it takes me a week to notice before I go in and resolve it. It's not perfect, but I can't be assed to fix something that happens once a year. :/
  • darknavi 2y ago
    Maybe you can beep the motherboard if it happens. Would only take a few hours to notice then :)
  • tomsmeding 2y ago
    > it takes me a week to notice before I go in and resolve it Perhaps the `|| true` on the `git stash pop` could have a bit more handling :)