Re: [DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread Daan Hoogland
Your getting the question, I just had the tense wrong. I meant in the future (implied by the 'resolution') On Wed, Sep 10, 2014 at 11:12 AM, sebgoa wrote: > > On Sep 10, 2014, at 11:09 AM, Daan Hoogland > wrote: > > > see you managed to do this strategy in the docs, great. plusone. any > > res

Re: [DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread sebgoa
On Sep 10, 2014, at 11:09 AM, Daan Hoogland wrote: > see you managed to do this strategy in the docs, great. plusone. any > resolutions on the how to keep the po files up to date? this is very much a manual process, the po files need to be generated by hand for each release based on the curren

Re: [DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread Daan Hoogland
see you managed to do this strategy in the docs, great. plusone. any resolutions on the how to keep the po files up to date? On Wed, Sep 10, 2014 at 10:47 AM, Rajani Karuturi wrote: > On Wed, Sep 10, 2014 at 1:14 PM, Sebastien Goasguen > wrote: > > > > > On Sep 10, 2014, at 3:04 AM, Rajani Kar

Re: [DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread sebgoa
On Sep 10, 2014, at 10:47 AM, Rajani Karuturi wrote: > On Wed, Sep 10, 2014 at 1:14 PM, Sebastien Goasguen > wrote: > >> >> On Sep 10, 2014, at 3:04 AM, Rajani Karuturi wrote: >> >>> While fixing a doc issue, I added *.po and *.mo files to the merge ignore >>> list(see .gitattributes file)

Re: [DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread Rajani Karuturi
On Wed, Sep 10, 2014 at 1:14 PM, Sebastien Goasguen wrote: > > On Sep 10, 2014, at 3:04 AM, Rajani Karuturi 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 yo

Re: [DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread Sebastien Goasguen
On Sep 10, 2014, at 3:04 AM, Rajani Karuturi 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 d

[DOC] cloudstack-docs-admin git merge strategy

2014-09-10 Thread Rajani Karuturi
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. 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 th