Gregory Jefferis wrote: > > 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. > > Thanks for the suggestion. I can see that could work but it does seem a bit > of a blunt instrument. We would need to change VCS (git has no locking > AFAIK). But I'll keep it in mind.
yes, sorry this suggestion was for subversion. when working with geeky people this is not much needed, they know ho to resolve merge conflicts. however for non geeky people svn locking seems to me the only weapon how to avoid the problems with conflicts, moreover when lyx has builtin support for locks... > >> LyX's track changes plays very poorly with VCS in LyX 1.6.X and this is > >> only > >> partly solved in 2.0. > > See: > > http://www.lyx.org/trac/ticket/6058 > > And in particular my post (+patch) which tries to explain why what has been > implemented for Lyx 2.0 is still fragile: > > http://www.mail-archive.com/[email protected]/msg153396.html yes i remember the thread. you unfortunately took too long hiatus and Vincent disappeared meanwhile... ;) i will reopen the ticket with the comments above, so there is still chance to get this into 2.0. i see also you didnt responded to Andre's comments... pavel
