Details
-
Bug
-
Resolution: Unresolved
-
P2: Important
-
QDS 4.5
-
None
Description
When QDS opens a project it updates the <project>.qmlproject.qtds file. This file is stored in git by default. Even if nothing is changed in the project the file is updated and this prevents smooth flow with Git.
Idea of the Git is to work as version control but also as a way to share projects between different team members.
Even if anything is updated on the project, QDS writes the Environment ID into the git and when another user does 'git pull' this obvisously fails.
Steps to reproduce
- Open QDS project with user A
- Save project
- Push to git
- Pull the project with user B from git
Expected result:
- Git pull goes smoothly through.
Actual result:
- Git pull fails and there is a merge conflict. Open the conflicting file and there is change in the <project>.qmlproject.qtds file like this
<<<<<<< HEAD
<!-- Written by QtDesignStudio 4.6.0, 2024-09-05T10:30:25. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<valuetype="QByteArray">{5ba5c7ff-a2a7-47fe-9117-eeb59a892943}</value>
=======
<!-- Written by QtDesignStudio 4.5.1, 2024-09-13T23:32:36. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<valuetype="QByteArray">{4e4eee19-c17d-426c-80c2-beeb111a418d}</value>
>>>>>>> main
This needs annoying 'git stash && git pull' as workaround.