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

Pull Request should not force --no-ff flag

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Resolved (View Workflow)
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: Pull Requests
    • 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

      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

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                benjambe Benny Benjamin
              • Votes:
                4 Vote for this issue
                Watchers:
                22 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: