Read the statement by Michael Teeuw here.
Can't update module because of unmerged files
-
I’m trying to update the MMM-OpenWeatherMapForecast module and I get this message after trying to use the command git pull: “error: Pulling is not possible because you have unmerged files.” I’m not sure how to proceed to resolve this issue.
-
@lvolkjr well that means you modified some of those files for some reason
try this
git reset --hard HEADall the changes will be lost
thengit pullwill work
ALL module config goes in config.js
ALL css goes in custom.css -
@sdetweil Thanks, that worked. Now MMM-OpenWeatherMapForecast just sits there and shows it’s Loading… Oh yeah, got to go and upgrade to the 3.0 API
-
S sdetweil has marked this topic as solved on
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login