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

Support Revert for Pull Requests that were merged using Fast Forward and Squash Merge strategies

    XMLWordPrintable

Details

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

    Description

      Issue Summary

      Currently, with Bitbucket Cloud, we do not have a way to track what merge strategy was used (commit, FF merge or Squash merge). Currently, we do not support Revert for PRs that was merged using Fast forward and Squash merges, but present the user with the Option anyways in the UI. 

      Steps to Reproduce

      1. Create a branch off the Main branch of the repo
      2. Add commits to the newly created branch
      3. Create a PR and merge that PR into the Main branch using Fast forward merge strategy
      4. Then try to revert it, you will be presented with an error message

      Expected Results

      It is sometimes expected for the revert not to be possible as there are conflicts.

      But it should work when there are no conflicts.

      Actual Results

      Users receive an error.

      Workaround

      Revert locally using the `git revert <commit hash>` command

      Attachments

        Issue Links

          Discovered while testing

          Suggestion - BCLOUD-19983 Support Revert for Pull Requests that were merged using Squash Merge strategy

          • Closed

          Activity

            People

              Unassigned Unassigned
              075ab5416c8c Katarína Lukácsy
              Votes:
              10 Vote for this issue
              Watchers:
              5 Start watching this issue

              Dates

                Created:
                Updated: