Jean-Marc Lasgouttes wrote: > Le 11/11/15 22:39, Scott Kostyshak a écrit : >>> Branch has less strings than master. (6609 vs. 6817). And not all >>> strings from branch are common with master. >> >> I see. So there is no rule that I can use to do what I want then. I >> guess I will just copy over the po files from branch that have not been >> updated on master then. I'm not sure what else I could do. > > You could try a tool like msgcat to merge the two files.
IMHO there is no alternative to merging, if you don't want to throw away translations, and don't want to invest too much time. We should have a helper script in develoment/tools for merging. Georg
