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

Custom merge conflict message

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Duplicate
    • None
    • None
    • None
    • 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

      We're in a situation where we have customized our git workflow, to the point that the merge conflict suggestions during pull requests do not match the reality of what a developer should do in the event of a merge conflict. We block pushes to our integration branches, we require that 1 extra user approves a pull request, and we require 1 good build from our Build Agents.
      This has us in a situation where we cannot follow the instructions in the merge conflict message that stash delivers, which ends up confusing new engineers, and causing issues for those that don't develop on shared projects all the time.

      We would like to customize the message to something that suits our workflow better.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              bstuart Ben Stuart
              Votes:
              2 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: