@ckubs Excellent, I'm glad that went well!

@ckubs The error "The following untracked working tree files would be overwritten by merge:" indicates that between the time that you last upgraded, and now, you have made some changes to the files in that list, and so the git command will not complete and you are not being upgraded. Have you been making changes to the Latvian translations? The best way to do that is through the Transifex localisation tool, and not by changing the public/language/lv files directly.

The easiest fix for you, if you are happy to lose your changes, is to simply delete all the files that the error is complaining about. If it's only the Latvian files, then you can do 'rm -rf public/language/lv' and they will be gone.

Alternatively, you can keep the Latvian files in another directory by doing 'mv public/language/lv public/language/my-lv'.

Once the files are no longer in existence, after you do one of the previous steps or something similar, retry the upgrade procedure!

Pēteris no Dublinas

@julian What is the branch policy at NodeBB? Could you possibly merge the 1.10.x branch back into master, so that master is up to date with 1.10.x functionality? Or are you planning to continue merging master's changes into the 1.10.x branch? I found that master's version is still 1.10.1 and to avoid getting the 'NodeBB is not up to date message' I had to check out the 1.10.x branch.

@julian Doing the Latvian work...