Re: Conflicts in branch

[Pavel Sanda]

> Why did so many files that I never modified just become conflicted?

because they get modified when making the sources.
if you are not doing some translatin work, simply
rm po/*.po po/lyx.pot
svn up

pavel