bigblop wrote:
I have some .lyx files under version control with SVN. But when I get a conflict I cannot open the conflicted .lyx file I get an error that the file is not a lyx document. How do I solve conflicted lyx files?
By hand-editing the .lyx file in a text editor. SVN adds tags when there is a conflict so it's rather easy to spot. A number of visual diff can help you in this task, I am using TortoiseSVN for Windows and/or Kdiff3 for example.
It seems that LyX is not very compatible with SVN will this compability issue be solved in the future?
Maybe, see: http://bugzilla.lyx.org/show_bug.cgi?id=1897 and: http://www.lyx.org/Donate#sponsorship If you want to sponsor a LyX solution. Abdel.
