On Wed, Nov 11, 2015 at 12:52:43AM -0800, Pavel Sanda wrote: > Scott Kostyshak wrote: > > I thought I just needed to overwrite the trunk po files with the branch > > po files, but it seems there are changes in the trunk po files that are > > not in branch (e.g. a73c2647). So what is the procedure for this? > > This is somewhat chaotic territory, you can't be really sure without > consulting git log. > Usually sk.po/de.po will be newer in master plus some random chunks when Uwe > proxy > commits. (I think last time he cared about this transition).
I see. I do not mind consulting git log. To make sure I understand correctly, just to simplify things, if I do the following: git log zz.po both on master and on branch, and I see that the date of the latest commit is newer on branch than it is on master, then I should copy the po file from branch to master. If the date of the latest commit is newer on master than it is on branch, then I should do nothing. Is that a sufficient rule to decide by? Or is there another source of chaos? Scott
