Uploaded image for project: 'Coin'
  1. Coin
  2. COIN-1215

Cherry pick merge conflict triggered with wrong reference

    XMLWordPrintable

Details

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

    Description

      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

      Attachments

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

        Activity

          People

            tosaario Toni Saario
            fredericl Frederic Lefebvre
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:

              Gerrit Reviews

                There are no open Gerrit changes