Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-2857

Pull Request should not force --no-ff flag

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Fixed
    • None
    • Pull Requests
    • None
    • 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

      The merge button on pull request does "git merge -no-ff".
      This is highly undesirable as it gives a bushy history line for no good reason.

      As it is not configurable at the moment, at least it should simply call "git merge" which allow fast forwards.

      Better yet merge behaviour and strategy should be configurable for the repository with the same default as "git merge" itself.
      And/or even allow these options for each pull request merge.

      With STASH-2810 and STASH-2753, this would make Pull Requests totally rocks.

      Attachments

        Issue Links

          has a derivative of

          Suggestion - BSERV-3092 Repository setting for turning off --no-ff on pull request merges

          • Closed
          is related to

          Suggestion - BSERV-2810 Option to squash commits when merging a pull request

          • Closed
          was cloned as

          Suggestion - BSERV-7134 Stash should expose the plugin.stash-scm-git.pullrequest.merge.strategy* setting in the UI

          • Closed

          Activity

            People

              Unassigned Unassigned
              52130ab4d90d Benny Benjamin
              Votes:
              4 Vote for this issue
              Watchers:
              22 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: