[Olsr-dev] release branches being merged into master?

[Ferry Huberts]

release branches are merged back into master, yes
only the last release branch when it has been released (again)

this is to make sure that our release script does the right thing

and this is the correct way to work.
merging master into a release branch; that is a big no-no


On 26/03/13 18:45, Hans-Christoph Steiner wrote:
>
> I noticed that some release branches (for example, release-0.6.5) are being
> merged back into master.  I seem to remember that the branch reorg stipulated
> that merges only ever happen from master into release branches, and never from
> release brances into master. Did that change?
>
> .hc
>

-- 
Ferry Huberts