Uploaded image for project: 'Qt Creator'
  1. Qt Creator
  2. QTCREATORBUG-16297

Submit editor could colorize files with merge conflicts

    XMLWordPrintable

Details

    • 3a78b610d76f315e5ac1a0c26844258b5c910a04

    Description

      Files with merge conflicts are displayed the same way as files with changes (except the check box is missing).

      They could be displayed in red if they prohibit a commit like the attached example (where the commit button is disabled).

      Attachments

        Activity

          People

            aha_1980 André Hartmann
            aha_1980 André Hartmann
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: