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

XMLWordPrintable

    • Type: Suggestion
    • Resolution: Answered
    • None
    • Component/s: None
    • None

      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).
       

            Assignee:
            Unassigned
            Reporter:
            Aaron Bromberg (Inactive)
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved: