Re: Conflicts in branch

2008-01-28 Thread Pavel Sanda
> On Mon, 2008-01-28 at 18:15 +0100, Pavel Sanda wrote: > > > Why did so many files that I never modified just become conflicted? > > > > because they get modified when making the sources. > > So why are they in the repository? because they contain translation string we use. compilation just syn

Re: Conflicts in branch

2008-01-28 Thread Darren Freeman
On Mon, 2008-01-28 at 18:15 +0100, Pavel Sanda wrote: > > Why did so many files that I never modified just become conflicted? > > because they get modified when making the sources. So why are they in the repository? Have fun, Darren

Re: Conflicts in branch

2008-01-28 Thread Richard Heck
Pavel Sanda wrote: 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 Or even simpler: svn revert po/*.po rh

Re: Conflicts in branch

2008-01-28 Thread 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