Getting an error when attempting to update MMM-Remote-Control

[MobbareKurtZ]

So when following the update guide of this module, I get an error. This is how it looks:

What should I do?

[yawns]

If you want to keep your changes to remote.html

git stash
git pull origin master
git stash pop

This saves your changes to remote.html, downloads the update and puts back in your changes remote.html.

Or, if you don’t need your local changes

git reset --hard
git pull origin master

[Jopyth]

@MobbareKurtZ As @yawns said: You have changed something in the remote.html file. If you want to know what that was, use git diff in the MMM-Remote-Control folder. You can use the methods describe above to reset or save the changes (you can replace the git pull origin master with calling the updater/installer).

[MobbareKurtZ]

@yawns @Jopyth Thanks!

Weird thing is, I have never changed anything in that file. And when I did like you told me to it went fine, except that it told me everything was up to date. Yet I am getting this on my mirror, any idea why?

[Jopyth]

@MobbareKurtZ You are on the develop branch. In this case use git pull origin develop (or run the installer again).

Did you do git diff before to see what the changes were? Strange that you did not change anything, but it still says so. Let me know if you encounter it again.