Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-6768

Detect and handle rebasing and auto-merge in more situations

    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      Bitbucket attempts to auto-merge pull requests that were merged locally via a rebase. It would be great if Bitbucket could detect more unique workflows and situations where rebasing may cause the pull request to lose track of the commits or branches. Or detect when a user has rebased and merged, then removed the branch that the pull request was the source/destination of.

            [BCLOUD-6768] Detect and handle rebasing and auto-merge in more situations

            After reviewing this issue, we determined that it was low priority and unlikely to be worked on in the near future. We appreciate your input, but want to be transparent about our decision to not fix this right now. 

            Katarína Lukácsy added a comment - After reviewing this issue, we determined that it was low priority and unlikely to be worked on in the near future. We appreciate your input, but want to be transparent about our decision to not fix this right now. 

            astiob added a comment -

            I got this pull request, and I pushed the commits to my repository directly. I was pretty sure this was supposed to automatically close the request, but nothing happened to it whatsoever. Why? And could an admin mark that PR as merged manually now?

            astiob added a comment - I got this pull request, and I pushed the commits to my repository directly. I was pretty sure this was supposed to automatically close the request, but nothing happened to it whatsoever. Why? And could an admin mark that PR as merged manually now?

            aiiie added a comment -

            Issue BCLOUD-7168 was marked as a duplicate of this issue.

            aiiie added a comment - Issue BCLOUD-7168 was marked as a duplicate of this issue.

            gdamore added a comment -

            Want to add my concurrence here as well! I'd be happy to have an "Integrated" button or somesuch that indicated that the changeset was integrated in a way that the webui can't detect. Could even include the changeset ID if that helped.

            gdamore added a comment - Want to add my concurrence here as well! I'd be happy to have an "Integrated" button or somesuch that indicated that the changeset was integrated in a way that the webui can't detect. Could even include the changeset ID if that helped.

            actually now that I look back at this, it seems that it doesn't merge only when I have to "git rebase master" after a "git pull --rebase"

            mbroadstone added a comment - actually now that I look back at this, it seems that it doesn't merge only when I have to "git rebase master" after a "git pull --rebase"

            I think this is what I'm looking for as well. My team all maintain a fork of the master project which only I have access to, and we use the pull requests to indicate that a feature is complete and should be merged in. After the relevant parties have approved the pull request, I then go to my local master checkout and "git pull --rebase <fork> <branch>" followed by a "git rebase master" (if needed) and pull the changes in that way. Unfortunately, this leaves us with a bunch of empty pull requests. For the meantime, I've been declining them with a message "rebase merged," but it would be great if we could capture that what really happened is that the pull request was merged in, just not with merge + an extra merge message

            mbroadstone added a comment - I think this is what I'm looking for as well. My team all maintain a fork of the master project which only I have access to, and we use the pull requests to indicate that a feature is complete and should be merged in. After the relevant parties have approved the pull request, I then go to my local master checkout and "git pull --rebase <fork> <branch>" followed by a "git rebase master" (if needed) and pull the changes in that way. Unfortunately, this leaves us with a bunch of empty pull requests. For the meantime, I've been declining them with a message "rebase merged," but it would be great if we could capture that what really happened is that the pull request was merged in, just not with merge + an extra merge message

              Unassigned Unassigned
              mbertrand aMarcus (Inactive)
              Votes:
              3 Vote for this issue
              Watchers:
              7 Start watching this issue

                Created:
                Updated:
                Resolved: