Git Pull Aborting



  • "Your local changes to the following files would be overwritten by merge:"
    long list of .tpls and .jsons in /public
    "Please, commit your changes or stash them before you can merge.
    Aborting"


  • Admin

    I'm assuming you made some changes to the code, possible templates or css? If you are you should be making your own theme instead of modifying the core so you don't lose your changes while upgrading.

    If you want to reset those changes you can do

    git reset --hard HEAD
    git pull
    ./nodebb upgrade
    


  • @psychobunny Are there any plans/ideas in the wood works that allow modifying of tpl files while still being able to upgrade without much resistance?



  • @Chris said:

    @psychobunny Are there any plans/ideas in the wood works that allow modifying of tpl files while still being able to upgrade without much resistance?

    This would be nice.


  • Admin

    I would say if you're modifying templates you should consider making a new theme, if you're making minor changes, then perhaps widgets would be what you need



  • @psychobunny said:

    I would say if you're modifying templates you should consider making a new theme, if you're making minor changes, then perhaps widgets would be what you need

    I'm working on both atm. Tweaks and a new theme. The tweaks is what's gotten me into trouble when i tried to update. Now it won't let me. I run the commands you mentiond above but it won't start up. I get the 502 nginx screen instead.


  • Admin

    hmm. when you ran those commands, any errors? also what error do you get when you run node app



  • xxx@xxx:~/mynodebb# node app
    info: NodeBB v0.3.2 Copyright (C) 2013 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: Sun Feb 23 2014 12:07:42 GMT-0500 (EST)
    info: Initializing NodeBB v0.3.2
    info: * using configuration stored in: /root/mynodebb/config.json
    info: * using redis store at 127.0.0.1:6379
    info: * using themes stored in: /root/mynodebb/node_modules
    warn: You have no redis password setup!
    warn: [plugins/nodebb-plugin-youtube] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-youtube] staticDir is deprecated, define CSS files with new staticDirs instead.
    warn: [plugins/nodebb-widget-essentials] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-widget-essentials] staticDir is deprecated, define CSS files with new staticDirs instead.
    warn: [plugins/nodebb-plugin-rss] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-sso-facebook] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-cash] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-cash] staticDir is deprecated, define CSS files with new staticDirs instead.
    warn: [plugins/nodebb-plugin-vimeo] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-vimeo] staticDir is deprecated, define CSS files with new staticDirs instead.
    warn: [plugins/nodebb-plugin-soundcloud] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-soundcloud] staticDir is deprecated, define CSS files with new staticDirs instead.
    warn: [plugins/nodebb-plugin-desktop-notifications] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-imgur] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-42] staticDir is deprecated, use staticDirs instead
    warn: [plugins/nodebb-plugin-42] staticDir is deprecated, define CSS files with new staticDirs instead.
    warn: [plugins/undefined] staticDir is deprecated, use staticDirs instead
    
    /root/mynodebb/node_modules/nodebb-plugin-sso-facebook/library.js:23
    		if (meta.config['social:facebook:app_id'] && meta.config['social:facebook:se
    		    ^
    ReferenceError: meta is not defined
        at Object.Facebook.getStrategy (/root/mynodebb/node_modules/nodebb-plugin-sso-facebook/library.js:23:7)
        at /root/mynodebb/src/plugins.js:286:32
        at /root/mynodebb/node_modules/async/lib/async.js:246:13
        at iterate (/root/mynodebb/node_modules/async/lib/async.js:131:13)
        at Object.async.eachSeries (/root/mynodebb/node_modules/async/lib/async.js:147:9)
        at Object.async.reduce (/root/mynodebb/node_modules/async/lib/async.js:245:15)
        at Object.Plugins.fireHook (/root/mynodebb/src/plugins.js:281:12)
        at EventEmitter.Auth.initialize (/root/mynodebb/src/routes/authentication.js:17:11)
        at EventEmitter.g (events.js:180:16)
        at EventEmitter.emit (events.js:117:20)
    
    


  • i deleted live-reload and facebook-sso and that resolved it. I'll try reinstalling them in a bit.


  • GNU/Linux Admin

    The latest version of the Facebook SSO plugin should resolve this. ./nodebb upgrade should take care of all package upgrades. Looks like it did not run.


Log in to reply
 

Suggested Topics

| |