I have recently observed a very weird merge conflict in Subversion. I am using tortoise SVN as the client. Please find the below information of the Trunk and branch details:
- \trunk\ . Two users are working on this.
- \QA\ is the branch where the merges from the trunk will happen.
- For simplicity sake, There is a visual studio solution in \trunk\ClassLibrary1.sln
- There is currently a sample project in the solution. \trunk\ClassLibrary1
- Both users are fully updated and dont have any working copy changes.
- Below sequence of events will take place.
- User 1 will first add a new project in the Solution and commit the entire directory. ( ClassLibrary11 )
- User 2 will take the update and add a new project in the solution and commit the entire directory structure ( ClassLibrary12 )
- Context: In the above additions, ClassLibrary11 is our feature X and ClassLibrary12 is our feature Y. Now feature Y is stable, completely independent of the feature X and can be moved to the QA branch.
- Merging process : We go to the QA branch and merge the feature Y from the trunk to the QA branch. It merges successfully without any conflict.
- After 3 weeks of dev, the feature X becomes stable and now we try to move feature X to the QA branch. But as we merge, it gives us merge conflicts in the ClassLibrary.sln file
The Intent : We want to automate the entire process as part of our Devops pipelines where features(which are completely independent) can be promoted to different branches from a dashboard which would merge revisions linked to features. In the above case feature X and feature Y are completely independent (functionally and code file wise as well). The only common point is that solution file ClassLibrary.sln file in which references to both the projects were added.
Tortoise SVN should have automatically figured it out that the revision was a just a reordering of 2 different commits. So I just want to know a way (redesign/preventive commit) so that such conflicts dont happen. And if they should happen then I need to know that while merging the Feature Y i.e. ClassLibrary12 that this would cause conflicts in future