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

Add functionality to use union merge in Bitbucket

    XMLWordPrintable

Details

    • 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.
    • EWT - Ignore

    Description

      When using the most recent GIT versions (>2.34.0), the union merge driver fails to work in Bitbucket and the PR shows merge conflicts. For particular files (like changelog), it is occasionally necessary to use merge=union in the .gitattributes file.

      It would be beneficial to have this feature in Bitbucket even though the use of custom merging drivers was never supported in Bitbucket.

      Attachments

        Issue Links

          duplicates

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

          • Gathering Interest

          Activity

            People

              Unassigned Unassigned
              83b3279fad28 Aman Shrivastava
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: