| I use LyX with version control. We put the software architecture document (about 100 pages) in a single .lyx file in a "doc" directory of our Git repository, which stores our software source code. We love feature branches, so we update not only the code, but the documentation as well, in the branch. When we merge, everything gets merged together. What I mean to say is, we're not just using Git to "check out, check in", we are also merging and branching as well. The workflow works perfectly for us. We've been using this for 2 years, with many many commits. Hardly any merge errors. And no times where Git merged wrongly and corrupted the document or similar. I fix merge errors in a text editor if they occur (maybe once every few months, takes a few minutes to repair.) One thing I would say is that LyX always writes the newline endings native to your platform. Git, by default, checks out Windows newlines on Windows and converts them to UNIX newlines on commit. So that works well too. But if you don't use that feature of Git, you might experience problems. We haven't had a need to edit the generated TeX document manually. We just use LyX. |