[HELP] NODEBB somehow reverted to 0.4.1 from 0.4.3

[julian]

You have files that have changed... use git stash to temporarily suspend them.

Some more links to learn more about the nature of this error: https://www.google.ca/search?q=error%3A+The+following+untracked+working+tree+files+would+be+overwritten+by+merge%3A&oq=error%3A+The+following+untracked+working+tree+files+would+be+overwritten+by+merge

[Giorgio Chiodi]

@julian said:

git stash

 *** Please tell me who you are.

???

[julian]

So follow the instructions and tell git who you are

[Giorgio Chiodi]

@julian ah sorry, thought that was it

[Giorgio Chiodi]

Hello we did a git reset --hard.
We are still on 0.4.1, apparently
Then we do a git checkout v0.4.x and we get this

    error: The following untracked working tree files would be overwritten by checkout:
docs/modules/index.rst
docs/plugins/settings.rst
npm-shrinkwrap.json
public/src/forum/account/edit.js
public/src/forum/account/favourites.js
public/src/forum/account/followers.js
public/src/forum/account/following.js
public/src/forum/account/header.js
public/src/forum/account/posts.js
public/src/forum/account/profile.js
public/src/forum/account/settings.js
public/src/forum/account/topics.js
public/src/forum/chats.js
public/src/forum/topic/browsing.js
public/src/forum/topic/events.js
public/src/modules/composer/controls.js
public/src/modules/settings/array.js
public/src/modules/settings/checkbox.js
public/src/modules/settings/key.js
public/src/modules/settings/number.js
public/src/modules/settings/select.js
public/src/modules/settings/textarea.js
src/settings.js
src/socket.io/plugins.js
src/user/auth.js
    Please move or remove them before you can switch branches.
    Aborting

@julian

[julian]

Good thing git tells you exactly what to do, right?

[Giorgio Chiodi]

@julian
so I should just go ahead?
no problem about the public folder, but what about those scripts at the end?

[julian]

error: The following untracked working tree files would be overwritten by checkout:

This error means git didn't have those files in the repository before, but they exist now. Git doesn't know what to do with them because you may have changed them.

If you didn't (which is most likely the case), delete them, and repeat the checkout.

[Giorgio Chiodi]

@julian said:

npm i

   npm http GET https://registry.npmjs.org/nodebb-theme-lavender/0.0.25-16
   npm http GET https://registry.npmjs.org/nodebb-theme-vanilla/0.0.19-53
   npm http 304 https://registry.npmjs.org/nodebb-theme-vanilla/0.0.19-53
   npm http 200 https://registry.npmjs.org/nodebb-theme-lavender/0.0.25-16
   npm http GET https://registry.npmjs.org/nodebb-theme-lavender/-/nodebb-theme-lavender-0.0.25-16.tgz
   npm http 200 https://registry.npmjs.org/nodebb-theme-lavender/-/nodebb-theme-lavender-0.0.25-16.tgz
   npm ERR! Error: shasum check failed for /home/super/tmp/npm-10080/1400245321914-0.14067961578257382/tmp.tgz
   npm ERR! Expected: 9819eed278a69ddd0af80c5f44965477b4cfc410
   npm ERR! Actual:   57a3e1badecdd876b68680a3f19554a9e74797ba
   npm ERR!     at /usr/share/npm/lib/utils/sha.js:29:20
   npm ERR!     at ReadStream.<anonymous> (/usr/share/npm/lib/utils/sha.js:49:5)
   npm ERR!     at ReadStream.EventEmitter.emit (events.js:117:20)
   npm ERR!     at _stream_readable.js:910:16
   npm ERR!     at process._tickCallback (node.js:415:13)
   npm ERR! If you need help, you may report this log at:
   npm ERR!     <http://bugs.debian.org/npm>
   npm ERR! or use
   npm ERR!     reportbug --attach /home/super/nodeBB/nodebb/npm-debug.log npm

   npm ERR! System Linux 3.11.0-12-generic
   npm ERR! command "/usr/bin/nodejs" "/usr/bin/npm" "i"
   npm ERR! cwd /home/super/nodeBB/nodebb
   npm ERR! node -v v0.10.15
   npm ERR! npm -v 1.2.18
   npm ERR! 
   npm ERR! Additional logging details can be found in:
   npm ERR!     /home/super/nodeBB/nodebb/npm-debug.log
   npm ERR! not ok code 0

[Giorgio Chiodi]

@julian

ok, retried and it installed.
but it's not launching.
opening the log shows:

info: * using themes stored in: /home/super/nodeBB/nodebb/node_modules
info: NodeBB v0.4.3 Copyright (C) 2013-2014 DesignCreatePlay Inc.
info: This program comes with ABSOLUTELY NO WARRANTY.
info: This is free software, and you are welcome to redistribute it under certain conditions.
info: 
info: Time: Fri May 16 2014 15:23:40 GMT+0200 (CEST)
info: Initializing NodeBB v0.4.3
info: * using configuration stored in: /home/super/nodeBB/nodebb/config.json
info: * using redis store at 127.0.0.1:6379
info: * using themes stored in: /home/super/nodeBB/nodebb/node_modules
info: NodeBB v0.4.3 Copyright (C) 2013-2014 DesignCreatePlay Inc.
info: This program comes with ABSOLUTELY NO WARRANTY.
info: This is free software, and you are welcome to redistribute it under certain conditions.
info: 
info: Time: Fri May 16 2014 15:23:40 GMT+0200 (CEST)
info: Initializing NodeBB v0.4.3
info: * using configuration stored in: /home/super/nodeBB/nodebb/config.json
info: * using redis store at 127.0.0.1:6379
info: * using themes stored in: /home/super/nodeBB/nodebb/node_modules
info: NodeBB v0.4.3 Copyright (C) 2013-2014 DesignCreatePlay Inc.
info: This program comes with ABSOLUTELY NO WARRANTY.
info: This is free software, and you are welcome to redistribute it under certain conditions.
info: 
info: Time: Fri May 16 2014 15:23:41 GMT+0200 (CEST)
info: Initializing NodeBB v0.4.3
info: * using configuration stored in: /home/super/nodeBB/nodebb/config.json
info: * using redis store at 127.0.0.1:6379
info: * using themes stored in: /home/super/nodeBB/nodebb/node_modules

[loader] Experienced three start attempts in 10 seconds, most likely an error on startup. Halting.