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

Add support for merge drivers when merging PRs ideally on a repo-by-repo bases


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

      We should allow support of git merge drivers on a repo-by-repo basis for PRs and branch model auto merges. This could include built in merge drivers (such as union) and custom merge drivers.

      Configuration could be done via config-as-code (e.g. via .gitattributes like Git supports) or in the application.

      This may be tricky to do as under the hood we use merging to calculate the effective diff for PRs and you'd probably want to see the effective diff unmolested by the merge driver but then perform the merge using the merge driver.

            Unassigned Unassigned
            mstudman Michael Studman (Inactive)
            92 Vote for this issue
            65 Start watching this issue