[Rock-dev] Fixing documentation in branch stable

[Sylvain Joyeux]

On 06/11/2013 11:25 AM, Leif Christensen wrote:
> Hi,
>
> could you please clarify the process on how to fix documentation, if the
> suggested change applies also to 'higer' branches than only stable?
>
> Docu says:
>> The guideline is that anything that applies to stable should be done on the stable branch as it is what new rock users see in the first place.
>
> Talking to Alex it seems that the proper way would be to
> - switch branch to master
> - do your bugfixes there
> - push to master
> - cherrypick the changes for stable
The best is to do the other way around:
  - fix on stable
  - merge stable on next and master

I would not push "normal" people to do the second (the merging). It will 
be done eventually when we push next to stable.

Sylvain