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

Merge Tool prompts are broken

    XMLWordPrintable

Details

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

    Description

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

      Attachments

        1. image-2023-10-15-16-37-29-180.png
          54 kB
          Orgad Shaneh
        2. image-2023-10-15-16-40-17-017.png
          77 kB
          Orgad Shaneh
        3. Screenshot from 2023-10-31 22-32-29.png
          26 kB
          Jarek Kobus
        4. Screenshot from 2023-10-31 22-37-42.png
          25 kB
          Jarek Kobus
        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

        Activity

          People

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

            Dates

              Created:
              Updated:

              Gerrit Reviews

                There are no open Gerrit changes