MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    Merging Two Forks MMM-homeassistant-sensors

    Scheduled Pinned Locked Moved Development
    3 Posts 2 Posters 549 Views 2 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • S Offline
      smoysauce
      last edited by

      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!

      S 1 Reply Last reply Reply Quote 0
      • S Offline
        sdetweil @smoysauce
        last edited by

        @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.

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        S 1 Reply Last reply Reply Quote 0
        • S Offline
          smoysauce @sdetweil
          last edited by

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

          1 Reply Last reply Reply Quote 0
          • 1 / 1
          • First post
            Last post
          Enjoying MagicMirror? Please consider a donation!
          MagicMirror created by Michael Teeuw.
          Forum managed by Sam, technical setup by Karsten.
          This forum is using NodeBB as its core | Contributors
          Contact | Privacy Policy