On Wed, Sep 10, 2014 at 1:14 PM, Sebastien Goasguen <run...@gmail.com> wrote:
> > On Sep 10, 2014, at 3:04 AM, Rajani Karuturi <raj...@apache.org> wrote: > > > While fixing a doc issue, I added *.po and *.mo files to the merge ignore > > list(see .gitattributes file) and merged from 4.3 to 4.4 to master. > > > > FYI: not sure what you are merging, but the .po and .mo are for the > localization. > Since the docs are different for each release the po files have different > strings, so we can't really mix them. > the .mo are actually binary files that technically should not be in the > repo but there seems to be a bug in readthedocs and that's the only way to > actually build the japanese and chinese pages. > > .po and .mo files arent merged. They are left untouched in any branch even after a merge. ~Rajani
