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

Custom help text for merge conflicts (when click on "More information")

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Unresolved
    • None
    • None
    • None
    • 10
    • 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 have a policy to always rebase our local branches as method of resolving merge conflicts. The help text you get in Bitbucket Server when opening the "More information" pop-up is therefor confusing.

      "This pull request can't be merged. You will need to resolve conflicts to be able to merge. More information."

      It suggests a merge from to-branch.

      Please make the content of this pop-up configurable per repository.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              607955ea-3bfd-44e4-a615-31edeedef4ae Fredrik Andersson (Inactive)
              Votes:
              35 Vote for this issue
              Watchers:
              34 Start watching this issue

              Dates

                Created:
                Updated: