Details
-
Suggestion
-
Resolution: Done
-
P3: Somewhat important
-
Qt Creator 3.6.0
-
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
For Gerrit Dashboard: QTCREATORBUG-16297 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
159653,3 | VCS: Colorize unmerged files in submit editor | master | qt-creator/qt-creator | Status: MERGED | +2 | 0 |