Git development branches

[bantu]

The proposal sounds good to me. I don't care much whether the branch names have a ".x" suffix or not. I would be in favour of switching over completely right away.

[MichaelC]

+1

[prototech]

Certainly much clearer this way. Yay.

[RMcGirr83]

+1 and yes I am guilty of performing nubbage as stated in the first post. Still trying to wrap my head around this branch, ticket stuffs.

[DavidIQ]

+1 good plan. I agree with bantu and should be done right away.

[nickvergessen]

Does anyone know what happens to PRs against a branch that is deleted on github?
I mean we can merge them just right, but I guess the UI breaks?

[nickvergessen]

Just tested on my newspage extension, and outstanding PRs are closed, without an option to be reopened.
https://github.com/nickvergessen/phpbb- ... e/pull/109

So I'd say we create the new branches, new stuff goes against 3.y.x branches, and we merge stuff into them.
Once the majority of the current PRs is merged, we delete the branches?

[nickvergessen]

The new branches have been created.
Please send new Pull Request to the new branches. Existing PRs can be kept, to avoid duplication.
Once most of the PRs are merged, we will delete the develop* branches.

[rxu]

+1 (better late than never).

[M.Gaetan89]

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'?