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

Git mergetool accepts reply only for the first prompt

    XMLWordPrintable

Details

    • b79449beddfc8c005c7bab6febdab2162827e735

    Description

      When the mergetool is closed, there's a prompt "Continue merging other unresolved paths (y/n) ?".

      Both values don't work, and the mergetool remains frozen forever.

      On Linux it works fine.

      IIRC the same issue happened to me also for submodule conflict.

      Deleted/Modified conflict does work as expected.

      This is very strange, since the script looks just the same for all of these.

      Any help will be appreciated...

      Attachments

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

        Activity

          People

            orgads Orgad Shaneh
            orgads Orgad Shaneh
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Gerrit Reviews

                There are no open Gerrit changes