After yet another instance of opening a Scrivener project and having it freak out about “file conflicts” that should have been easily resolvable—but which it provides no tools to even do a manual diff on—I’m going to think more on plain text solutions.