Michael Schmitt <[EMAIL PROTECTED]> writes:
|
| when running "cvs update", I got a conflict in po/POTFILES.in. How is that
| possible? Does it make sense to put a file into the repository that is
| modified during compilation?
perhaps not...
I tend to think that this file should be under manual control.
| cvs server: Updating po
| RCS file: /cvs/lyx/lyx-devel/po/POTFILES.in,v
| retrieving revision 1.181
| retrieving revision 1.182
| Merging differences between 1.181 and 1.182 into POTFILES.in
| rcsmerge: warning: conflicts during merge
| cvs server: conflicts found in po/POTFILES.in
| C po/POTFILES.in
rm po/POTFILES.in
and update again.
--
Lgb
