On 3.07.08, 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.
The conflict markers break the structure of the .lyx file (generally, it might be ok in some cases). > How do I solve conflicted lyx files? In a text editor or opening the two conflicting versions in lyx. Günter
