Merging Two Forks MMM-homeassistant-sensors

[smoysauce]

Hi, I am wanting to merge these two forks of the same module together. I’d like to merge the ability to add attributes from this fork: https://github.com/moejetz/MMM-homeassistant-sensors with the advanced configuration of this fork:https://github.com/hildwin/MMM-homeassistant-sensors but I can’t seem to figure out how to do it. Github can’t do it automatically, which I figured it wouldn’t. Just not sure if it would be a ton of work or relatively easy. I’ve been trying to research some resources on this but I’m still new to a lot of this. Not sure the best approach, what programs/tools to use to make it easier on myself. Any insight would be appreciated!

[sdetweil]

@smoysauce there is no magic. merge works when the source and dest have common places and they can be changed to a new result. if not it’s all manual, one line at a time.

[smoysauce]

@sdetweil Bummer, oh well, no better way for me to learn…thanks for verifying!