cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sebastien Goasguen <run...@gmail.com>
Subject Re: [DOC] cloudstack-docs-admin git merge strategy
Date Wed, 10 Sep 2014 07:44:52 GMT

On Sep 10, 2014, at 3:04 AM, Rajani Karuturi <rajani@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.

> If we could follow this, it would be really helpful.
> Basically, fix in the lowest possible version and merge upwards. The merges
> would be very trivial as they would most likely be your change only.
> 
> Please let me know if you see any issues with this.
> 
> $ git branch --contains fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
>  4.3
>  4.4
> * master
> 
> peace :)
> 
> 
> ~Rajani


Mime
View raw message