Hello everyone,
We are using git with TouchGFX so more than one developer can work in the same TouchGFX file. However every time we try to merge the project it get corrupted. We also tried to some the confiltc manually but it also didn't work.
I would be very grateful if someone could give me a solution to this problem.
