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

        Issue Links

          Activity

            People

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

              Dates

                Created:
                Updated: