Uploaded image for project: 'Qt Quality Assurance Infrastructure'
  1. Qt Quality Assurance Infrastructure
  2. QTQAINFRA-7357

Improve error message when staging fails because of a merge conflict

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: P3: Somewhat important P3: Somewhat important
    • None
    • production
    • Gerrit
    • None
    • 2881da7ff (v3.10-based)

      Currently the error message displayed when staging fails is not very informative. The message should be improved to say that the conflict can be also with the staging branch.

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

            daniel.smith Daniel Smith
            jujokini Jukka Jokiniva
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes