On Sep 12, 2014, at 11:19 AM, Rom Walton <[email protected]> wrote: > I committed fixes for that stuff this morning.
That actually made things worse. I now get the errors on a pull: > git -c diff.mnemonicprefix=false -c core.quotepath=false -c > credential.helper=sourcetree pull origin master > From ssh://isaac.ssl.berkeley.edu/boinc-v2 > * branch master -> FETCH_HEAD > error: Your local changes to the following files would be overwritten by > merge: > html/languages/translations/hu.po > html/languages/translations/nl.po > locale/bg/BOINC-Web.po > locale/da/BOINC-Web.po > locale/el/BOINC-Web.po > locale/fr/BOINC-Web.po > locale/hr/BOINC-Web.po > locale/hu/BOINC-Project-Generic.po > locale/hu/BOINC-Web.po > locale/it_IT/BOINC-Project-Generic.po > locale/lv/BOINC-Web.po > locale/nl/BOINC-Project-Generic.po > locale/nl/BOINC-Web.po > locale/pl/BOINC-Web.po > locale/pt_BR/BOINC-Web.po > locale/ro/BOINC-Web.po > locale/sk/BOINC-Web.po > locale/zh_TW/BOINC-Web.po > Please, commit your changes or stash them before you can merge. > Aborting > Updating ce97e85..7dd986a > Completed with errors, see above I didn't see any way to do the checkout -f in SourceTree, so I finally fixed it by manually deleting all 19 files before doing a pull, But we still have the 2 bad files in the 7.4 branch: locale/da/BOINC-Web.po locale/nl/BOINC-Project-Generic.po Please fix these. Cheers, --Charlie _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
