Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-7192

Support pull-requests with automatic merging having pull-requests without automatic merging

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Closed (View Workflow)
    • Resolution: Duplicate
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Feedback Policy:
      We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      Description

      Basically we're looking for a solution to this question: https://answers.atlassian.com/questions/13418077/with-stash-automatic-merge-how-can-i-avoid-an-automatic-merge at the pull-request level in Stash.

      When doing a pull-request with automatic merging we want to say "do not auto-merge". The pull-request would then merge to the target branch normally but then do an "ours" merge down the "auto-merge cascade" so that subsequently the change would not be merged down.

      Alternatively, potentially allow a cherry-pick/interactive merge for when there are commits that you may not want merged.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              gordon.waddell Gordon Waddell
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: