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

Cherry pick merge conflict triggered with wrong reference

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: P2: Important P2: Important
    • None
    • master
    • Gerrit
    • None
    • All

      A merge conflict was triggered with the patch below while cherry picking. The file modified by the patch is not touched at all in the merge conflict  alert. 

      File modified in the below patch viewtestutils.cpp/ fake merge conflict with  tst_qquickpopup.cpp

      Check if showView uses updated position (624312) · Gerrit Code Review

       

      The same issue with the patch below:
      Harden tst_QWindow::framePositioningStableAfterDestroy() (626281) · Gerrit Code Review

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

            gerrit-admin Gerrit Admin
            fredericl Frederic Lefebvre
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

              Created:
              Updated:

                There are no open Gerrit changes