-
Suggestion
-
Resolution: Done
-
P2: Important
-
Qt Creator 6.0.2
-
None
-
All
-
6612fd16a7 (qt-creator/qt-creator/7.0) 6612fd16a7 (qt-creator/qt-creator/master) 6612fd16a7 (qt-creator/tqtc-qt-creator/7.0) 6612fd16a7 (qt-creator/tqtc-qt-creator/master)
When merge conflicts occur and the file has been deleted, there is currently no way to resolve the situation from Creator (at least when no external merge tool is used).
It would be nice to have a context menu in the commit editor to restore or delete the file.
- is required for
-
QTCREATORBUG-19721 Git user interface improvements
-
- Reported
-
| For Gerrit Dashboard: QTCREATORBUG-26994 | ||||||
|---|---|---|---|---|---|---|
| # | Subject | Branch | Project | Status | CR | V |
| 394240,3 | Git: Fix parsing in mergetool | 7.0 | qt-creator/qt-creator | Status: MERGED | +2 | 0 |