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

Commit dialog doesn't recognize whe merge tool finished

    XMLWordPrintable

    Details

      Description

      This seems to be a regression for some versions (I think it happens at least since 3.3)

      Steps to reproduce:

      1. Do an operation that leads to a merge conflict (in my case git pull + rebase)
      2. Open the commit editor and double click the "modified by both" file
      3. The merge tool opens (in my case Tortoise Git Merge), resolve the conflict, close the merge tool
      4. The commit editor still shows State "modified by both" and does not allow to press commit
      5. Do a context change to another Creator window, e.g. by Ctrl+Tab, switch back to commit editor: the State changed to "staged + modified"
      6. Now it's possible to commit

      In former versions the steps 4 and 5 were not necessary.

        Attachments

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

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

              Dates

              Created:
              Updated:
              Resolved:

                Gerrit Reviews

                There are no open Gerrit changes