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

Merge Tool prompts are broken

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: P3: Somewhat important P3: Somewhat important
    • None
    • Qt Creator 4.3.1, Qt Creator 11.0.3, Qt Creator 12.0.0-beta2
    • Windows

      • Cherry pick a commit that has conflicts with the current state.
      • Run merge tool when requested
      • Quit the merge tool without saving
      • A prompt should appear: "Was the merge successful?"
      • No matter what you choose - it keeps re-appearing.
      • The sh process consumes 100% CPU while waiting.
      • The only way to quit this loop is by killing the git (and shell) process.

      In Windows Terminal it works as expected:

      I thought this was a regression, but I went back all the way to 4.3, and it doesn't work there either. Possibly something that has changed in the shell, Git or Windows 10.

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

            jkobus Jarek Kobus
            orgads Orgad Shaneh
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:

                There are no open Gerrit changes