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

Allow removing file with "git rm"

    XMLWordPrintable

Details

    • 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)

    Description

      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.

      Attachments

        Issue Links

          is required for

          Task - A task that needs to be done. QTCREATORBUG-19721 Git user interface improvements

          • P3: Somewhat important - Should be fixed, but doesn't affect the release in any way.
          • 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

          Activity

            People

              orgads Orgad Shaneh
              aha_1980 André Hartmann
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes