Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (athena.apache.org: domain of runseb@gmail.com designates
 74.125.82.45 as permitted sender)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\))
Subject: Re: [DOC] cloudstack-docs-admin git merge strategy
From: Sebastien Goasguen <runseb@gmail.com>
In-Reply-To: 
 <CAPpf5a2OPjZReVuch8R2ksSh0S05SrKPCkW4n_P1gbzK3UniFA@mail.gmail.com>
Date: Wed, 10 Sep 2014 03:44:52 -0400
Content-Transfer-Encoding: quoted-printable
Message-Id: <397ABCE2-18F7-419C-97A8-0F53C2A99036@gmail.com>
References: 
 <CAPpf5a2OPjZReVuch8R2ksSh0S05SrKPCkW4n_P1gbzK3UniFA@mail.gmail.com>
To: dev@cloudstack.apache.org


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.
>=20

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.
>=20
> Please let me know if you see any issues with this.
>=20
> $ git branch --contains fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
>  4.3
>  4.4
> * master
>=20
> peace :)
>=20
>=20
> ~Rajani