Update

zkab

OK - what I did before I read you answer was … made a copy of my changes and issued ‘git reset --hard’ … and copied back the changed moduled and after that following:

git stash
git pull && npm install
git stash apply
but got some warnings … how do I get rid of this …

no such file or directory, open '/home/pi/MagicMirror/modules/package.json - this is not anything I have done

what about Changes not staged for commit and Untracked files

pi@mirror:~/MagicMirror/modules/default/currentweather $ git stash
Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
pi@mirror:~/MagicMirror/modules/default/currentweather $ git pull && npm install
Already up-to-date.
npm WARN enoent ENOENT: no such file or directory, open '/home/pi/MagicMirror/modules/package.json'
npm WARN enoent ENOENT: no such file or directory, open '/home/pi/MagicMirror/modules/node_modules/node_helper/package.json'
npm WARN modules No description
npm WARN modules No repository field.
npm WARN modules No README data
npm WARN modules No license field.
pi@mirror:~/MagicMirror/modules/default/currentweather $ git stash apply
On branch master
Your branch is ahead of 'origin/master' by 4 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

	modified:   ../../../css/custom.css
	modified:   currentweather.js

Untracked files:
  (use "git add ..." to include in what will be committed)

	../../../css/custom.css.leo
	../../../fonts/my_fonts/

no changes added to commit (use "git add" and/or "git commit -a")
pi@mirror:~/MagicMirror/modules/default/currentweather $

Still confused but at a higher level …

shbatm

pi@mirror:~/MagicMirror/modules/default/currentweather $ git pull && npm install

Make sure you’re in the ~/MagicMirror directory before running the command.

what about Changes not staged for commit and Untracked files

Ignore them. For your purposes, you don’t need to worry about them as long as all the merge errors are gone.

zkab

OK - I went to ~/MagicMirror directory and fired the gun …

pi@mirror:~/MagicMirror $ git stash
Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
pi@mirror:~/MagicMirror $ git pull && npm install
remote: Counting objects: 70, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 70 (delta 38), reused 52 (delta 33), pack-reused 13
Unpacking objects: 100% (70/70), done.
From https://github.com/MichMich/MagicMirror
   8893df1..86ae704  develop    -> origin/develop
Already up-to-date.

> magicmirror@2.1.2 install /home/pi/MagicMirror
> cd vendor && npm install


> magicmirror@2.1.2 postinstall /home/pi/MagicMirror
> sh installers/postinstall/postinstall.sh

MagicMirror installation successful!
npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.
pi@mirror:~/MagicMirror $ git stash apply
On branch master
Your branch is ahead of 'origin/master' by 4 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit: ~/MagicMirror
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

	modified:   css/custom.css
	modified:   modules/default/currentweather/currentweather.js

Untracked files:
  (use "git add ..." to include in what will be committed)

	css/custom.css.leo
	fonts/my_fonts/

no changes added to commit (use "git add" and/or "git commit -a")
pi@mirror:~/MagicMirror $

shbatm

@zkab Looks like everything worked to me for what you’re trying to do.

bhepler

Please use the Markdown features to post code and console output. It makes it so much easier to read.

zkab

OK and thanks for your support …