P.S: I also noticed than when I merge from trunk to my branch, some of the
texts I proofread are reverted to the previous version. I will will also have
to mantually diff everything. after the merge.
The general rules for the merge conflicts that bazaar flags up are this:
- Ignore the po/pot, w
I did a merge on my local hard drive trunk -> gci18nfixes, and now I get a
whole bunch of errors of the type
/src/logic/productionsite.h:156:33: error: ‘override’ does not name a type
/src/logic/productionsite.h:157:38: error: expected ‘;’ at end of member
declaration
I get them in logic and ec
2 matches
Mail list logo
