Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-9315

As a developer, I would like to be able to use the "merge ours" strategy for pull requests

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Closed (View Workflow)
    • Resolution: Answered
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Feedback Policy:
      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

      Problem Definition

      As a developer, I would like to be able to use the "merge ours" strategy to automatically resolve conflicts in for pull requests

      Suggested Solution

      Add the "merge ours" strategy to the list of supported merge strategies at the repository, project, and global level
       

      Workaround

      Merge locally without a pull request, and then push the result (bypass Bitbucket Server for merging).
       

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              abromberg Aaron Bromberg
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: