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

Provide the option for Stash to perform Implicit Merges

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Closed (View Workflow)
    • Resolution: Answered
    • 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

      Consider following situation:

      1. there are more than one pull requests concurrently waiting for merge.
      2. these pull requests could be handled by command line git with fast-forward, no conflicts at all.

      Stash's current behavior is:

      a. the first pull request could be merged
      b. all subsequent pull requests would FAILED merge
      c. annoying information dialog appear to ask 'do refresh'
      d. even no way to 'decline' the pull request before 'do refresh'

      ---------

      Stash's behavior should align with command line git to handle (no conflict) 3 way merge as handy as possible.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              abromberg Aaron Bromberg (Inactive)
              Votes:
              1 Vote for this issue
              Watchers:
              5 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: