{"action":"opened","issue":{"url":"https://api.github.com/repos/MichMich/MagicMirror/issues/1339","repository_url":"https://api.github.com/repos/MichMich/MagicMirror","labels_url":"https://api.github.com/repos/MichMich/MagicMirror/issues/1339/labels{/name}","comments_url":"https://api.github.com/repos/MichMich/MagicMirror/issues/1339/comments","events_url":"https://api.github.com/repos/MichMich/MagicMirror/issues/1339/events","html_url":"https://github.com/MichMich/MagicMirror/issues/1339","id":337317941,"node_id":"MDU6SXNzdWUzMzczMTc5NDE=","number":1339,"title":"Newest MagicMirror Update","user":{"login":"meischdaddy30","id":39597143,"node_id":"MDQ6VXNlcjM5NTk3MTQz","avatar_url":"https://avatars1.githubusercontent.com/u/39597143?v=4","gravatar_id":"","url":"https://api.github.com/users/meischdaddy30","html_url":"https://github.com/meischdaddy30","followers_url":"https://api.github.com/users/meischdaddy30/followers","following_url":"https://api.github.com/users/meischdaddy30/following{/other_user}","gists_url":"https://api.github.com/users/meischdaddy30/gists{/gist_id}","starred_url":"https://api.github.com/users/meischdaddy30/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/meischdaddy30/subscriptions","organizations_url":"https://api.github.com/users/meischdaddy30/orgs","repos_url":"https://api.github.com/users/meischdaddy30/repos","events_url":"https://api.github.com/users/meischdaddy30/events{/privacy}","received_events_url":"https://api.github.com/users/meischdaddy30/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-07-01T20:04:28Z","updated_at":"2018-07-01T20:04:28Z","closed_at":null,"author_association":"NONE","body":"Hi all,\r\n\r\n\r\n\r\nSo an update for MagicMirror just came out today and I have a question about it.  When I navigate to my MagicMirror folder and use the \r\n\r\n`git pull && npm install`\r\n\r\nI get the following errors.\r\n\r\n`Updating 60b9a5b..3545f80`\r\n\r\n`error: Your local changes to the following files would be overwritten by merge:\r\n\tpackage-lock.json\r\n\tpackage.json\r\n\tvendor/package-lock.json`\r\n\r\n`Please commit your changes or stash them before you merge.\r\nAborting`\r\n\r\nI am still fairly new to writing and interpreting code but I'm wondering what I should do here.  Should I move those files to another directory and retry the update command?  My worry is that if I do this then my MMM-Assistant will not work (it took me about a month to finally get the module to work so I really would not like that to happen).\r\n\r\nThinking to myself it shouldn't affect the MMM-Assistant module at all because these .json files are in my `MagicMirror` directory not my `MMM-Assistant` directory.  But then I just read the updates for the Magic Mirror from [https://github.com/MichMich/MagicMirror/releases](url) it says it has updated the electron version to v2.0.0.  My MMM-Assistant electron-rebuild is currently at v1.7.3 https://github.com/eouia/MMM-Assistant/blob/master/package.json (this is my version as far as I know)\r\n\r\nSo my real question is, will removing the .json files from the `MagicMirror` directory and then updating the to the newest MagicMirror version affect, in any way, my MMM-Assistant module/directory due to the difference in electron versions?\r\n  \r\nI'm running Raspberry Pi 3 model b\r\nweb browser version - Version 65.0.3325.181 (Official Build) Built on Raspbian , running on Raspbian 9.4 (32-bit)\r\n`$ node -v\r\nv9.11.2`\r\n`$ npm -v\r\n6.1.0`\r\n\r\n\r\nAny help would be much appreciated!"}}
{"actor":{"display_login":"meischdaddy30"}}