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.
User avatar
bantu
3.0 Release Manager
3.0 Release Manager
Posts: 557
Joined: Thu Sep 07, 2006 11:22 am
Location: Karlsruhe, Germany
Contact:

Re: Git development branches

Post by bantu » Mon Feb 16, 2015 2:46 pm

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.

User avatar
MichaelC
Development Team
Development Team
Posts: 889
Joined: Thu Jan 28, 2010 6:29 pm

Re: Git development branches

Post by MichaelC » Mon Feb 16, 2015 10:27 pm

+1
Formerly known as Unknown Bliss
psoTFX wrote: I went with Olympus because as I said to the teams ... "It's been one hell of a hill to climb"
No unsolicited PMs please except for quotes.

User avatar
prototech
Former Team Member
Posts: 53
Joined: Mon Mar 12, 2007 12:25 am

Re: Git development branches

Post by prototech » Mon Feb 16, 2015 11:00 pm

Certainly much clearer this way. Yay.

User avatar
RMcGirr83
Registered User
Posts: 357
Joined: Fri Mar 09, 2007 1:51 am
Contact:

Re: Git development branches

Post by RMcGirr83 » Tue Feb 17, 2015 10:56 am

+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.
Do not hire Christian Bullock he won't finish the job and will keep your money

User avatar
DavidIQ
Customisations Team Leader
Customisations Team Leader
Posts: 1731
Joined: Thu Mar 02, 2006 4:29 pm
Location: Earth
Contact:

Re: Git development branches

Post by DavidIQ » Tue Feb 17, 2015 1:18 pm

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

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 » Tue Feb 17, 2015 5:52 pm

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

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 » Tue Feb 17, 2015 6:08 pm

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

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 » Tue Feb 17, 2015 6:27 pm

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

User avatar
rxu
Registered User
Posts: 124
Joined: Tue Apr 04, 2006 4:28 pm
Contact:

Re: Git development branches

Post by rxu » Tue Feb 17, 2015 7:13 pm

+1 (better late than never).
Image

User avatar
M.Gaetan89
Registered User
Posts: 64
Joined: Tue Jan 28, 2014 7:17 pm
Location: Divonne-les-Bains, France
Contact:

Re: Git development branches

Post by M.Gaetan89 » Wed Feb 18, 2015 6:05 pm

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

Post Reply