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

Add support for fixing merge conflicts

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Duplicate
    • Not Evaluated
    • None
    • None
    • All Other Issues
    • None

    Description

      It would be cool to be able to rebase in Creator so that any conflicts are listed (similar to how search results are now) and you can fix each conflict one by one, without having to search for >>> or === or <<<.

      Attachments

        Issue Links

          duplicates

          Suggestion - Public suggestions QTCREATORBUG-16493 Extend DiffEditor to a full merge tool

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

          Activity

            People

              con Eike Ziller
              mitch_curtis Mitch Curtis
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes