Git development branches

[Khaos-Rage]

I noticed there is no branch 3.2.x. Is there a reason?

More generally, will branch 'develop-x' be synced with its corresponding new branch? (as long as the 'develop-x' branch exists, of course).
Or should current PR be rebased against '3.x' instead of 'develop-x'?

[/url]The git branches have been renamed to version numbers, to make it easier for people to contribute.

When you extensions tests fail, make sure to check against the right branch:
https://github.com/nickvergessen/phpbb- ... l/23/files

List of old => new branch names

• develop => master
• develop-ascraeus => 3.1.x
• develop-olympus => 3.0.x

So master is 3.2 I believe.

[nickvergessen]

we will merge PRs that go against develop* branches into the respective 3.*.x branches.
develop is now called master.

The develop branches are abandoned and will not be kept in sync.
They will also be dropped as soon as the PRs against them are merged.

[sajaki]

hi,
just to confirm, what's the 3.2 branch called ? "Master" ?

[Nicofuma]

yes