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

Pull requests: Add support for handling "submodule" merge conflicts

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Fixed
    • 3.5.0
    • Pull Requests
    • 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.

      Conflicts in submodules currently cause Stash to fall back on a diff-to-common-ancestor strategy, indicating the pull request cannot be merged but without showing any conflicts in the diff.

              jpalacios Juan Palacios (Inactive)
              jpalacios Juan Palacios (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated:
                Resolved: