.po branch diff handling

[francois-pasquier]

Hi, my dev team is REALLY pushy about me ditching .po files and going with .json translations.

That said, I'd like to maintain .po files.

Could anyone chime in regarding ideas to reduce the frictions when you have two branches that add their translations?

My idea was to simply work on the translations as separate branches once the feature is over.

[timofei-iatsenko]

It depends on many factors:

• do you use TMS?
• Do you add translations to different branches or just new messages (no translations)
• What is your pain point, the conflicts in the source link comments? or conflicts in the messages itself?