Git development branches

Discuss general development subjects that are not specific to a particular version like the versioning control system we use or other infrastructure.
Khaos-Rage
Registered User
Posts: 35
Joined: Wed Aug 06, 2014 12:27 am

Re: Git development branches

Post by Khaos-Rage » Wed Feb 18, 2015 9:08 pm

M.Gaetan89 wrote: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'?
So master is 3.2 I believe.

User avatar
nickvergessen
Former Team Member
Posts: 733
Joined: Sun Oct 07, 2007 11:54 am
Location: Stuttgart, Germany
Contact:

Re: Git development branches

Post by nickvergessen » Wed Feb 18, 2015 11:10 pm

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.
Member of the Development-TeamNo Support via PM

sajaki
Registered User
Posts: 86
Joined: Mon Jun 21, 2010 8:28 pm

Re: Git development branches

Post by sajaki » Tue Dec 29, 2015 1:08 pm

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

Nicofuma
3.2 Release Manager
3.2 Release Manager
Posts: 297
Joined: Sun Apr 13, 2014 1:40 am
Location: Paris

Re: Git development branches

Post by Nicofuma » Tue Dec 29, 2015 1:28 pm

yes
Member of the phpBB Development-Team
No Support via PM

Post Reply