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

Bad Bitbucket Pull Request Merge Conflict Instructions

    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

      When create a Pull Request with a conflict, if you click "More Information", then a dialog opens up with instructions to locally merge the feature branch into master, commit, and push to master along with a note that this will automatically mark the PR as merged.

      This would totally circumvent the pull request and mark the PR as merged before it was done being reviewed. Also, very likely the developer will not and should not have permission to push directly to the master branch.

      This is not the workflow we want our engineers to follow. Is there a way to customize these instructions on our local installation of Bitbucket. Also we would humbly suggest Atlassian change these instructions to a workflow that does not require the developer to push directly to the master branch - either by merging/rebasing master into the feature branch (locally) or by creating a conflict-resolution branch as described here: https://answers.atlassian.com/questions/39126202/answers/39126269

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              452017104681 Tim Crall
              Votes:
              1 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: