Navigation

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

    Squash commits on pull requests?

    Development
    2
    4
    303
    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.
    • luckman212
      luckman212 last edited by

      If I squash (merge) commits on a branch from my fork that I've submitted as a PR, will they get squashed on the PR as well? I ask this because, e.g, on PR#3983 —it would have been easier to squash the 2 commits vs. closing and opening a whole new PR with a single combined commit.

      System Patches couldn't deal with 3983.patch so I had to toss the whole thing and start a new branch and a new PR.

      Should be asking this over on StackExchange instead?
      Thanks

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

        That's usually the case. Unfortunately our workflow doesn't let us do the squashing right in the github interface but if you squash locally and push it should work.

        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
        • luckman212
          luckman212 last edited by

          Great, I'll try that next time. Thanks

          1 Reply Last reply Reply Quote 0
          • luckman212
            luckman212 last edited by

            Just wanted to let you know, I just tried this on PR#3989 (which was previously 2 commits) and I was able to squash it! Worked great.

            1 Reply Last reply Reply Quote 0
            • First post
              Last post