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

UIP merge conflicts issue

    XMLWordPrintable

Details

    Description

      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

      Attachments

        Issue Links

          relates to

          Suggestion - Public suggestions QT3DS-3816 Element ID's are not unique, this is causing merge issues

          • P1: Critical - Urgent and Important, will STOP the release if matched with set FixVersion field. This includes regressions from the last version that are not edge cases; Data loss; Build issues; All but the most unlikely crashes/lockups/hanging; Serious usability issues and embarrassing bugs & Bugs critical to a deliverable. This is the highest possible priority for requirements.
          • Closed
          resulted from

          User Story - Created by Jira Software - do not edit or delete. Issue type for a user story. QT3DS-3308 Support customer project X

          • P1: Critical - Urgent and Important, will STOP the release if matched with set FixVersion field. This includes regressions from the last version that are not edge cases; Data loss; Build issues; All but the most unlikely crashes/lockups/hanging; Serious usability issues and embarrassing bugs & Bugs critical to a deliverable. This is the highest possible priority for requirements.
          • In Progress
          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

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes