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

XMLWordPrintable

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

            [BSERV-4566] Add support for merge drivers when merging PRs ideally on a repo-by-repo bases

            Veenstra Gerard added a comment - - edited

            +1 please please please (especially for the union merge driver to support no-conflict changelogs)

            + there is a similar request here https://jira.atlassian.com/browse/BCLOUD-12935 

            Veenstra Gerard added a comment - - edited +1 please please please (especially for the union merge driver to support no-conflict changelogs) + there is a similar request here https://jira.atlassian.com/browse/BCLOUD-12935  

            George Shaw added a comment -

            To the people posting "+1" comments: The correct way to vote for an issue is to click "Vote for this issue". Find this in the top right, under the "People" heading.

            Posting "+1" comments is pointless – no one is counting the comments. Posting comments like this just causes annoyance to people watching the issue.

            George Shaw added a comment - To the people posting "+1" comments: The correct way to vote for an issue is to click "Vote for this issue". Find this in the top right, under the "People" heading. Posting "+1" comments is pointless – no one is counting the comments. Posting comments like this just causes annoyance to people watching the issue.

            Alex Oren added a comment -

            +1

            Alex Oren added a comment - +1

            Aidan Gallagher added a comment -

            + 1

            Aidan Gallagher added a comment - + 1

            James Russell added a comment -

            +1

            This would come in handy for resolving conflicts in Relay-generated GraphQL type definition files.

            James Russell added a comment - +1 This would come in handy for resolving conflicts in Relay-generated GraphQL type definition files.

            J K added a comment - - edited

            +1

            Often custom merge drivers are used for non-line-oriented files (binaries, models in some spec language like xml, json, etc.). So the standard diff (+ view) may not be all that useful either. 

            J K added a comment - - edited +1 Often custom merge drivers are used for non-line-oriented files (binaries, models in some spec language like xml, json, etc.). So the standard diff (+ view) may not be all that useful either. 

            Ramvart Gupta added a comment -

            +1

            Ramvart Gupta added a comment - +1

            Dylan Montandon added a comment -

            +1

            Dylan Montandon added a comment - +1

            Alexandre Oudin added a comment -

            +1

            Alexandre Oudin added a comment - +1

            Ashkan Nourkhalaj added a comment -

            +1

            Ashkan Nourkhalaj added a comment - +1

              Unassigned Unassigned
              mstudman Michael Studman (Inactive)
              Votes:
              97 Vote for this issue
              Watchers:
              69 Start watching this issue

                Created:
                Updated: