Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-12935

Ability to automatically resolve merge conflicts

    XMLWordPrintable

Details

    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

    Description

      In a pull request I would like Bitbucket to automatically resolve merge conflicts on a specific file such that it always takes the version in the pull request. We have a release notes file that we update with each branch we deliver. We always want the version being delivered. Since it is always changing it often results in a merge conflict when two pull requests are happening at the same time.

      In the .gittattributes file you can set a merge rule to override the default merge algorithm. For example the following rule will always take the version from "our" branch if there is a conflict:

      release_notes.txt merge=ours

      This does not appear to be supported in Bitbucket cloud though. Could it be?

      Attachments

        Activity

          People

            Unassigned Unassigned
            a1d2dea23b47 Phil Rittenhouse
            Votes:
            15 Vote for this issue
            Watchers:
            11 Start watching this issue

            Dates

              Created:
              Updated: