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

Extend DiffEditor to a full merge tool

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Unresolved
    • Not Evaluated
    • None
    • Qt Creator 4.1.0-beta1, Qt Creator 4.3.0
    • Editors, Version Control Integration
    • None

    Description

      This is one of the last things I miss in QtCreator: when running into merge conflicts I have to set up and use an external merge tool on every computer I work.

      The quality of the different merge tools differ, but I think a merge tool included in Creator would be mighty and easy to use.

      In principle this could work like in TortoiseMerge: The side-by-side diff stays as-is, and in a third window below them the resolution is shown. This third window is editable to manually adjust conflicts.

      Attachments

        1. screenshot-1.png
          110 kB
          Elias Steurer

        Issue Links

          is duplicated by

          Suggestion - Public suggestions QTCREATORBUG-23129 Add support for fixing merge conflicts

          • Not Evaluated - Not yet evaluated/prioritized
          • Closed
          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
          relates to

          Bug - A problem which impairs or prevents the functions of the product. QTCREATORBUG-21147 Git hangs on mergetool prompt

          • P3: Somewhat important - Should be fixed, but doesn't affect the release in any way.
          • Closed
          No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

              jkobus Jarek Kobus
              aha_1980 André Hartmann
              Votes:
              6 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

                Created:
                Updated:

                Gerrit Reviews

                  There are no open Gerrit changes