Netgate Discussion Forum
    • Categories
    • Recent
    • Tags
    • Popular
    • Users
    • Search
    • Register
    • Login

    Difference between master and RELENG_2_1 branches in Github

    Scheduled Pinned Locked Moved 2.1 Snapshot Feedback and Problems - RETIRED
    4 Posts 2 Posters 1.2k Views
    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
      ssheikh
      last edited by

      A bit confused between the different braches on Github. Can someone point me in the direction where these are discussed.

      Should I be doing commits to RELENG_2_1 branch or master?

      Thanks,

      Shahid

      1 Reply Last reply Reply Quote 0
      • jimpJ
        jimp Rebel Alliance Developer Netgate
        last edited by

        Master is the most current code ahead of 2.1 (e.g. what will be 2.2)

        We branched 2.1 because it was nearing release, so master could be opened for more intrusive changes again.

        If a commit is a bug fix for 2.1, it should actually be done on both master and RELENG_2_1 (or done on one and cherry-picked to the other)

        New features would be for master only at this point.

        Remember: Upvote with the ๐Ÿ‘ button for any user/post you find to be helpful, informative, or deserving of recognition!

        Need help fast? Netgate Global Support!

        Do not Chat/PM for help!

        1 Reply Last reply Reply Quote 0
        • S
          ssheikh
          last edited by

          Thx.

          So if I cherry-pick a commit from one branch to the other, I have to submit a pull request for each branch separately right?

          1 Reply Last reply Reply Quote 0
          • jimpJ
            jimp Rebel Alliance Developer Netgate
            last edited by

            Yes, assuming the commit is critical enough to be accepted for 2.1

            Remember: Upvote with the ๐Ÿ‘ button for any user/post you find to be helpful, informative, or deserving of recognition!

            Need help fast? Netgate Global Support!

            Do not Chat/PM for help!

            1 Reply Last reply Reply Quote 0
            • First post
              Last post
            Copyright 2025 Rubicon Communications LLC (Netgate). All rights reserved.