Our git based version control system also tracks changes in .qsys files of platform designer systems. However, I have found that if there is a merge conflict in such a system, there is no meaningful way to carry out a diff and then resolve the conflicts. The .qsys file is basically an XML file from what I can say.
Is there a method provided by Intel Quartus that can be used to carry out a diff between two .qsys files to see how the two systems differ?
If you're using Quartus Pro version 21.1, you can use the diff tool which can be used on Platform Designer as you wanted to. However, earlier versions do not have this feature.
Let me know if you have any more questions.
We did not receive any response to the previous reply that I have provided, thus I will put this case to close pending. Please post a response in the next 15 days to allow me to continue to support you. After 15 days, this thread will be transitioned to community support. The community users will be able to help you with your follow-up questions.
PS: If you find any comment from the community or Intel Support to be helpful, feel free to give Kudos.