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

Can't stage change because of non-existent merge conflict

    XMLWordPrintable

Details

    • Bug
    • Resolution: Incomplete
    • Not Evaluated
    • None
    • master
    • Gerrit
    • None

    Description

      I'm getting "FAILED: Reason: merge conflict" with https://codereview.qt-project.org/c/qt/qtquickcontrols2/+/275323 even though it can be cherry-picked locally to 5.14 without issues.

      Attachments

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

        Activity

          People

            gerrit-admin Gerrit Admin
            mitch_curtis Mitch Curtis
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Gerrit Reviews

                There are no open Gerrit changes