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

Show files with conflict markers as conflicted

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Answered
    • None
    • None
    • 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.

      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.

              Unassigned Unassigned
              3652ed9ede2e Alexey Efimov
              Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

                Created:
                Updated:
                Resolved: