How to synchronize translations edited on the server?

Question

symfony

Translations are sometimes added by developers directly to xlf, sometimes they are edited on the server by the customer via jmc-translation-editor.
How to reconcile this? In order not to overwrite the customer's translations when git pull on the server

Answer 1

Плохая идея, но я пока вижу только один выход. Делать коммит на prod сервере. Сливать его в какой нить репозиторий (BitBacket, GitHub) Делать слияние prod и dev веток, а потом заливать всё на prod

Answer 2

We did this:
Locally, we add only the keys and the base value of the translation. Never push files with translations. Everything is edited for sale. If it so happened that it is necessary to test the translation, then we generate the translation locally, test if everything is ok revert and push. Our main rule is never to push transfers. In another project, a file with translations in .gitignore (there is no longer a jms bundle, but the essence is the same). Not the most convenient scheme for me, but we have no problems because of the transfers.