Uploaded image for project: 'Qt 3D Studio'
  1. Qt 3D Studio
  2. QT3DS-3883

UIP merge conflicts issue

XMLWordPrintable

      We spend a lot of time for resolving merge conflicts. Each change in presentation leads us to merge conflicts, the resolution of which is a hard and time consuming task. We require a solution to enable merge when multiple HMI developers use project.
      Please see attachment

        1. Merge issue.pptx
          272 kB
          Sergey Tyuntyaev
        For Gerrit Dashboard: QT3DS-3883
        # Subject Branch Project Status CR V
        275270,4 Preserve fileids when doing cut and paste 2.5 qt3dstudio/qt3dstudio Status: MERGED +2 0

            anmaatta Antti Määttä
            sergeytyuntyaev Sergey Tyuntyaev
            Votes:
            0 Vote for this issue
            Watchers:
            6 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes