<![CDATA[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.

]]>https://forum.magicmirror.builders/topic/19075/can-t-update-module-because-of-unmerged-filesRSS for NodeTue, 06 Oct 2026 09:30:39 GMTThu, 24 Oct 2024 01:07:20 GMT60<![CDATA[Reply to Can't update module because of unmerged files on Thu, 24 Oct 2024 03:45:24 GMT]]>@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

]]>https://forum.magicmirror.builders/post/120799https://forum.magicmirror.builders/post/120799Thu, 24 Oct 2024 03:45:24 GMT<![CDATA[Reply to Can't update module because of unmerged files on Thu, 24 Oct 2024 12:36:28 GMT]]>@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

]]>https://forum.magicmirror.builders/post/120803https://forum.magicmirror.builders/post/120803Thu, 24 Oct 2024 12:36:28 GMT<![CDATA[Reply to Can't update module because of unmerged files on Thu, 24 Oct 2024 03:45:24 GMT]]>@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

]]>https://forum.magicmirror.builders/post/120799https://forum.magicmirror.builders/post/120799Thu, 24 Oct 2024 03:45:24 GMT