Show files with conflict markers as conflicted

XMLWordPrintable

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

      We using crossmerging strategy, then a big one merge commit is commited 'as is' with unresolved conflicted files. Files start contains 'Conflict Markers' as 'Automerge' commit for Stash Pull Request.
      Will be nice, if Stash start render not only Automerge commit, but also anyone commit in Pull Request, if it contains conflict markers.

            Assignee:
            Unassigned
            Reporter:
            Alexey Efimov
            Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

              Created:
              Updated:
              Resolved: