Gregory Jefferis wrote: > We use version control (git) + to write papers in the lab. It works fine > but handling merge conflicts is still difficult; the chaps in the lab are
in one project we 'solved' this via locking. the document could be split into childern (=chapters/sections) so multiple people can still work simultaneously. > LyX's track changes plays very poorly with VCS in LyX 1.6.X and this is only > partly solved in 2.0. can you be more specific here? pavel