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

XMLWordPrintable

    • Type: Suggestion
    • Resolution: Fixed
    • 3.5.0
    • Component/s: Pull Requests
    • None

      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.

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

              Created:
              Updated:
              Resolved: