[Solved] Problems upgrading from 0.4.2 to 0.4.3

[anooxy]

I have problems upgrading. I stopped my forum and did a git pull and received the following problems:

    error: Your local changes to the following files would be overwritten by merge:
    .tx/config
    README.md
    app.js
    docs/help/help.rst
    docs/index.rst
    docs/installing/cloud/heroku.rst
    docs/plugins/hooks.rst
    docs/plugins/settings.rst
    docs/upgrading/index.rst
    install/data/defaults.json
    install/databases.js
    nodebb
    package.json
    public/language/ar/error.json
    public/language/ar/global.json
    public/language/ar/modules.json
    public/language/ar/topic.json
    public/language/ar/user.json
    public/language/cs/error.json
    public/language/cs/global.json
    public/language/cs/modules.json
    public/language/cs/topic.json
    public/language/cs/user.json
    public/language/de/error.json
    public/language/de/global.json
    public/language/de/modules.json
    public/language/de/topic.json
    public/language/de/user.json
    public/language/[email protected]/error.json
    public/language/[email protected]/global.json
    public/language/[email protected]/modules.json
    public/language/[email protected]/topic.json
    public/language/[email protected]/user.json
    public/language/en_GB/error.json
    public/language/en_GB/global.json
    public/language/en_GB/modules.json
    public/language/en_GB/user.json
    public/language/en_US/error.json
    public/language/en_US/global.json
    public/language/en_US/modules.json
    public/language/en_US/topic.json
    public/language/en_US/user.json
    public/language/es/error.json
    public/language/es/global.json
    public/language/es/modules.json
    public/language/es/success.json
    public/language/es/topic.json
    public/language/es/unread.json
    public/language/es/user.json
    public/language/et/error.json
    public/language/et/global.json
    public/language/et/modules.json
    public/language/et/topic.json
    public/language/et/user.json
    public/language/fa_IR/error.json
    public/language/fa_IR/global.json
    public/language/fa_IR/modules.json
    public/language/fa_IR/topic.json
    public/language/fa_IR/user.json
    public/language/fi/error.json
    public/language/fi/global.json
    public/language/fi/modules.json
    public/language/fi/topic.json
    public/language/fi/user.json
    public/language/fr/error.json
    public/language/fr/global.json
    public/language/fr/modules.json
    public/language/fr/topic.json
    public/language/fr/user.json
    public/language/he/error.json
    public/language/he/global.json
    public/language/he/modules.json
    public/language/he/topic.json
    public/language/he/user.json
    public/language/hu/error.json
    public/language/hu/global.json
    public/language/hu/modules.json
    public/language/hu/topic.json
    public/language/hu/user.json
    public/language/it/error.json
    public/language/it/global.json
    public/language/it/modules.json
    public/language/it/topic.json
    public/language/it/user.json
    public/language/ja/error.json
    public/language/ja/global.json
    public/language/ja/modules.json
    public/language/ja/topic.json
    public/language/ja/user.json
    public/language/lt/error.json
    public/language/lt/global.json
    public/language/lt/modules.json
    public/language/lt/topic.json
    public/language/lt/user.json
    public/language/ms/error.json
    public/language/ms/global.json
    public/language/ms/modules.json
    public/language/ms/topic.json
    public/language/ms/user.json
    public/language/nb/error.json
    public/language/nb/global.json
    public/language/nb/modules.json
    public/language/nb/topic.json
    public/language/nb/user.json
    public/language/nl/error.json
    public/language/nl/global.json
    public/language/nl/modules.json
    public/language/nl/topic.json
    public/language/nl/user.json
    public/language/pl/error.json
    public/language/pl/global.json
    public/language/pl/modules.json
    public/language/pl/topic.json
    public/language/pl/user.json
    public/language/pt_BR/error.json
    public/language/pt_BR/global.json
    public/language/pt_BR/modules.json
    public/language/pt_BR/topic.json
    public/language/pt_BR/user.json
    public/language/ru/error.json
    public/language/ru/global.json
    public/language/ru/modules.json
    public/language/ru/topic.json
    public/language/ru/user.json
    public/language/sc/error.json
    public/language/sc/global.json
    public/language/sc/modules.json
    public/language/sc/topic.json
    public/language/sc/user.json
    public/language/sk/category.json

error: The following untracked working tree files would be overwritten by merge:
    docs/modules/index.rst
    public/language/en_GB/tags.json
    public/language/ko/category.json
    public/language/ko/error.json
    public/language/ko/footer.json
    public/language/ko/global.json
    public/language/ko/language.json
    public/language/ko/login.json
    public/language/ko/modules.json
    public/language/ko/notifications.json
    public/language/ko/pages.json
    public/language/ko/recent.json
    public/language/ko/register.json
    public/language/ko/reset_password.json
    public/language/ko/success.json
    public/language/ko/topic.json
    public/language/ko/unread.json
    public/language/ko/user.json
    public/language/ko/users.json
    public/src/admin.js
    public/src/forum/chats.js
    public/src/forum/infinitescroll.js
    public/src/forum/tag.js
    public/src/modules/settings/number.js
    public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css
    public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js
    src/controllers/tags.js
    src/privileges.js
    src/privileges/categories.js
    src/privileges/helpers.js
    src/privileges/posts.js
    src/privileges/topics.js
    src/topics/tags.js
    src/user/auth.js
Please move or remove them before you can merge.
Aborting

Then when starting the forum I get a warn: [socket.io] Unrecognized message: meta.updateHeader, and when going back and forth between pages the margings of the template dissapear. Any idea?

[julian]

@anooxy That git message suggests that there were/are files that will be overwritten by the pull. For your safety, git aborted the process.

If you're sure you didn't change anything, then do this:

$ git reset --hard HEAD
$ git merge origin/master
$ ./nodebb upgrade
$ ./nodebb restart

[anooxy]

@julian It aborts after I issue the second command you gave me with the same error.. And no I haven't changed a thing.

[julian]

Okay then, in that case.

Do a git reset --hard HEAD, then execute git status

Then git clean -f -d

Then continue as I've instructed in my previous post.

[julian]

... failing that, just delete the folder and clone a new copy... that would work too (but also removes any plugins you have installed)

[anooxy]

@julian I was just looking at the git clean command XD.

And yes it worked, thank you.

[anooxy]

@julian I still get the "warn: [socket.io] Unrecognized message: meta.updateHeader" in the logs however I don't see any problem in the forum so far.

[julian]

That warning means that someone is running a very old version of NodeBB's client side code (and simply hasn't refreshed, or hasn't cleared their browser cache). So not to worry