Merging of dfm files with different translation data
Posted: Thu Oct 24, 2019 7:57 am
Hello,
I have the following problem. I have two files from the same base file, say file A and file AA. In file A I did some new translation and in file AA I developed some new features. When I now try to reintegrate / merge file A into file AA with Subversion, the translation data of file AA gets messed up.
I am not able to do an automated merge. I have to ignore the messed up translation data from file AA and copy the translation data block manually from A to AA and commit the changes.
My question now: Is there some best practices or another way to circumvent this situation?
The main problem is, that the translation data is not readable.
Can the storage of the translation data in the *.dfm files be turned off?
Thanks for your help.
I have the following problem. I have two files from the same base file, say file A and file AA. In file A I did some new translation and in file AA I developed some new features. When I now try to reintegrate / merge file A into file AA with Subversion, the translation data of file AA gets messed up.
I am not able to do an automated merge. I have to ignore the messed up translation data from file AA and copy the translation data block manually from A to AA and commit the changes.
My question now: Is there some best practices or another way to circumvent this situation?
The main problem is, that the translation data is not readable.
Can the storage of the translation data in the *.dfm files be turned off?
Thanks for your help.