@baris Facing similar error when accessing /admin/advanced/database on v1.11
iTerm2.png
No luck. Stuck here
Auto-merging npm-shrinkwrap.json
CONFLICT (add/add): Merge conflict in npm-shrinkwrap.json
@meetdilip said:
No luck. Stuck here
Auto-merging npm-shrinkwrap.json
CONFLICT (add/add): Merge conflict in npm-shrinkwrap.json
I see this when trying to upgrade BitBangers, I dont know enough about git to bypass it myself.
This is stopping me from upgrading too.
@meetdilip What's your output of git status
?
EDIT: I'm guessing what has happened is maybe you manually modified some file(s) in your folder -- which is a git folder. git pull
does several things. I'm not an expert, but among them it does git fetch
& git merge
and I'm not sure what else. Anyway, since you modified some files and it's trying to merge it can't because the file(s) are different. So, first you have to do a git status
to see what's going on. Then, from the looks of the output you've already shown you'll have to do something with the npm-shrinkwrap.json file.
You can also try git diff
which might give you some more info about what's different since you've already tried to git pull
Basically, git doesn't want to merge because it doesn't know which file(s) you want to keep...the one getting pulled in or the one you've modified. It could be something as simple as an extra space somewhere, or even just a different timestamp (I think) on the file.
Disclaimer: As I've already stated, I'm not an expert with git -- still learning it myself -- so this may not be exact.
Thanks @mootzville . Only changes I made are installing a few themes and plugins. I have not made any manual edit to any of the files as far as I can remember.
git status result
new file: public/less/mixins.less
I must also thank @frissdiegurke who tried to help me in between.
Restored using snapshotp and git status gave
[email protected]:~/home/nodebb# git status
nothing added to commit but untracked files present (use "git add" to track)
[email protected]:~/home/nodebb#
@meetdilip, open npm-shrinkwrap.json
with a text editor and replace its content with the contents of this file.
After you've done that do a git add npm-shrinkwrap.json
, git commit -am "updated files"
and git push
and things should be working.
@meetdilip said:
Restored using snapshotp and git status gave [...]
That just means that the public/google-adsense.config.json
isn't being tracked by git (it isn't under source control). Most likely that file was added by some NodeBB plugin.
You can either add it to the git repo using git add pulic/google-adsense.config.json
and then git commit -am "added adsense config file"
and git push
to update the remote repository, or ignore that message.
So nice of you @fuzzmz . I am just need to try the last step then, right ?
@fuzzmz said:
git add pulic/google-adsense.config.json
[email protected]:~# git add pulic/google-adsense.config.json
fatal: Not a git repository (or any of the parent directories): .git
[email protected]:~# cd home/nodebb
[email protected]:~/home/nodebb# git add pulic/google-adsense.config.json
fatal: pathspec 'pulic/google-adsense.config.json' did not match any files
[email protected]:~/home/nodebb#
@meetdilip it should be public
instead of pulic
. Sorry for the typo
Techiewiz running on 0.5.1 Thanks to @fuzzmz and all.
@meetdilip Glad to hear.
Also, I have been reading a great book about git you might want to look into. It's called 'Version Control with Git' and it's written by a couple of guys that work at github. It's published by O'Reilly.
Thanks @mootzville
A free and really good alternative to the book mentioned by @mootzville is Git - Book. It teaches best practices, as well as providing both in depth information and quick reference.
error: Cannot find module '../public/src/templates'
Error: Cannot find module '../public/src/templates'
at Function.Module._resolveFilename (module.js:338:15)
at Function.Module._load (module.js:280:25)
at Module.require (module.js:364:17)
at Object.<anonymous> (E:\nodejs\tpc\node_modules\nodebb-plugin-cash\library
.js:7:28)
at Module._compile (module.js:456:26)
at Object.Module._extensions..js (module.js:474:10)
at Module.load (module.js:356:32)
at Function.Module._load (module.js:312:12)
at Module.require (module.js:364:17)
at require (module.js:380:17)
info: [app] Shutdown (SIGTERM/SIGINT) Initialised.
error: Connection Closed By Application
error: undefined
info: [app] Database connection closed.
Don't know why it always shows up this error when I start the nodeBB after upgrade. My git say everything is up-to-date.
@Hưng-Thành-Nguyễn I'm wagering the "cash" plugin is not compatible with the latest version. You might want to remove it:
./nodebb reset plugin="nodebb-plugin-cash"
@julian thank you so much, but it's still very painful to hear that. It's quite important plugin.
@psychobunny can you fix this issue for new nodebb? I can manage to try, but hopefully it will be fixed by you
@julian it seems to refuse to load. This is the log when I run nodebb in development mode:
info: NodeBB v0.5.2 Copyright (C) 2013-2014 NodeBB 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: Thu Oct 02 2014 13:44:36 GMT-0400 (EDT)
info: Initializing NodeBB v0.5.2
info: * using configuration stored in: /root/tpc/config.json
info: * using mongo store at 127.0.0.1:27017
info: * using themes stored in: /root/tpc/node_modules
info: Base Configuration OK.
morgan deprecated morgan(options): use morgan("default", options) instead src/logger.js:128:22
morgan deprecated default format: use combined format src/logger.js:128:22
info: [notifications.init] Registering jobs.
info: [user.startJobs] Registering User Jobs
info: Enabling 'trust proxy'
[cluster] Child Process (1323) listening for connections.
info: [themes] Using theme nodebb-theme-lavender
info: [plugins] Initializing plugins system
info: Middlewares loaded.
info: [plugins] Found 1 CSS file(s) for plugin nodebb-widget-essentials
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-markdown
info: [plugins] Found 2 js file(s) for plugin nodebb-plugin-markdown
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-mentions
info: [plugins] Found 2 js file(s) for plugin nodebb-plugin-mentions
info: [plugins] Found 2 js file(s) for plugin nodebb-plugin-desktop-notifications
warn: [plugins/nodebb-plugin-imgshow] staticDir is deprecated, use staticDirs instead
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-imgshow
warn: [plugins/nodebb-plugin-spoilers] staticDir is deprecated, use staticDirs instead
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-spoilers
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-spoilers
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-emoji-extended
info: [plugins] Found 2 js file(s) for plugin nodebb-plugin-emoji-extended
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-cards
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-cards
info: [plugins] Found 2 LESS file(s) for plugin nodebb-plugin-poll
info: [plugins] Found 6 js file(s) for plugin nodebb-plugin-poll
info: [plugins] Found 3 CSS file(s) for plugin nodebb-plugin-gallery
info: [plugins] Found 6 js file(s) for plugin nodebb-plugin-gallery
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-shoutbox
info: [plugins] Found 2 js file(s) for plugin nodebb-plugin-shoutbox
warn: [plugins/nodebb-plugin-featured-threads] staticDir is deprecated, use staticDirs instead
info: [plugins] Found 1 CSS file(s) for plugin nodebb-plugin-featured-threads
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-spam-be-gone
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-spam-be-gone
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-google-analytics
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-google-adsense
info: [plugins] Found 1 LESS file(s) for plugin nodebb-plugin-youtube-lite
info: [plugins] Found 2 js file(s) for plugin nodebb-plugin-youtube-lite
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-beep
info: [plugins] Found 1 js file(s) for plugin nodebb-plugin-buttons-galore
info: [plugins] Found 3 js file(s) for plugin nodebb-theme-lavender
info: [plugins] Loaded plugin: nodebb-widget-essentials
info: [plugins] Loaded plugin: nodebb-plugin-markdown
info: [plugins] Loaded plugin: nodebb-plugin-soundpack-default
info: [plugins] Loaded plugin: nodebb-plugin-mentions
info: [plugins] Loaded plugin: nodebb-plugin-dbsearch
info: [plugins] Loaded plugin: nodebb-plugin-imgur
info: [plugins] Loaded plugin: nodebb-plugin-sso-google
info: [plugins] Loaded plugin: nodebb-plugin-sso-facebook
info: [plugins] Loaded plugin: nodebb-plugin-desktop-notifications
info: [plugins] Loaded plugin: nodebb-plugin-imgshow
info: [plugins] Loaded plugin: nodebb-plugin-spoilers
info: [plugins] Loaded plugin: nodebb-plugin-emoji-extended
info: [plugins] Loaded plugin: nodebb-plugin-imgbed
info: [plugins] Loaded plugin: nodebb-plugin-cards
info: [plugins] Loaded plugin: nodebb-plugin-poll
info: [plugins] Loaded plugin: nodebb-plugin-gallery
info: [plugins] Loaded plugin: nodebb-plugin-shoutbox
info: [plugins] Loaded plugin: nodebb-plugin-featured-threads
info: [plugins] Loaded plugin: nodebb-plugin-spam-be-gone
info: [plugins] Loaded plugin: nodebb-plugin-google-analytics
info: [plugins] Loaded plugin: nodebb-plugin-google-adsense
info: [plugins] Loaded plugin: nodebb-plugin-color
info: [plugins] Loaded plugin: nodebb-plugin-youtube-lite
info: [plugins] Loaded plugin: nodebb-plugin-beep
info: [plugins] Loaded plugin: nodebb-plugin-buttons-galore
info: [plugins] Loaded plugin: nodebb-theme-lavender
info: [plugins] Sorting hooks to fire in priority sequence
warn: [plugins] The `action:app.load` hook is deprecated in favour of `static:app.load`, please notify the developers of the following plugins:
* nodebb-plugin-imgshow
* nodebb-plugin-poll
* nodebb-plugin-featured-threads
* nodebb-plugin-spam-be-gone
* nodebb-plugin-google-adsense
info: [hotswap] Router with id `plugins` replaced successfully
info: [plugins] All plugins reloaded and rerouted
info: [plugins] Plugins OK
info: [meta/css] Minifying LESS/CSS
warn: [meta/css] File not found! nodebb-plugin-featured-threads/css/main.css
info: NodeBB attempting to listen on: 0.0.0.0:4567
info: [hotswap] Router with id `auth` replaced successfully
info: NodeBB is now listening on: 0.0.0.0:4567
[cluster] Child Process (1323) listening for connections.
info: [sounds] Sounds OK
info: [meta/templates] Compiling templates
info: [meta/css] Done.
info: [meta/css] Committing stylesheet (acpCache) to disk
info: [themes] Successfully compiled templates.
info: [meta/css] Stylesheet (acpCache) committed to disk.
info: [meta/css] Done.
info: NodeBB Ready
info: [meta/css] Committing stylesheet (cache) to disk
info: [socket] uid 1 (HI6Q070wYm8fFNx_9rBw) has successfully reconnected.
info: [meta/css] Stylesheet (cache) committed to disk.
info: [meta/js] Successfully minified.
info: [meta/js] Retrieved Mapping.
info: [meta/js] Compilation complete
info: [meta/js] Committing minfile to disk
info: [meta/js] Client-side minfile and mapping committed to disk.