Hi @Netto-Hikari, thanks for your feedback about our upgrade process 😄 We definitely try to make the upgrade process fluid and straightforward, but if files have been changed, then yes, there will be problems as git will not know how to handle changed files.
Re:
When it comes to upgrades, I just simply follow the docs and it always says that I have to commit the changes before.
Did you mean Step 3? As far as I know, the only thing we ask admins to do before upgrading is back up their data. If you have never changed any of the core files, git should never complain.
If this ever happens, and you are absolutely sure you didn't change anything, then you are advised to run the following:
$ git fetch # to grab the latest code (but not apply it)
$ git reset --hard origin/v0.5.x # force your local files to match the NodeBB repository *EXACTLY*
$ ./nodebb upgrade # then proceed with upgrade as usual
^ Hooray, more unsolicited advice from strangers on the internet 😄
After running those commands, future attempts to git pull should not have git complain.
