Can't update module because of unmerged files

[lvolkjr]

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.

[sdetweil]

@lvolkjr well that means you modified some of those files for some reason

try this

git reset --hard HEAD

all the changes will be lost
then

git pull 

will work

ALL module config goes in config.js
ALL css goes in custom.css

[lvolkjr]

@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