develop vs. master

[mfn]

Hi there 👋🏼

I see that develop is the default branch and also now ahead of master. Got the picture so far, and it also seems releases will be cut from develop.

master is already behind on develop…

So I was just wondering: except legacy from the fork, do we need this?

Isn't one "main" branch just sufficient where all merges are being made from and merge PRs there in?

Version specific (maintenance) branches would be a different topic, in case someone things in that direction (e.g. a 1.x branch)

Thanks!

[Messhias]

In fact, we use master to make the releases, in the day of release open a PR to master and it's done. But having the main branch would not be a problem at all.

By the way, @eschricker , when will be the next release?

[mfn]

I brought this up, so a 👍🏼 from me

Achtung:

• we've open PRs, we should merge them before doing that into develop
• for this one time, before assimilating develop into main, we should create a PR for develop->main so everything have a "quick sane look" if we're fine. I already did with main...develop but better have everyone recently being involved having a quick check on a PR before proceeding.

I was actually surprised we're 60 commits ahead 😱

[Messhias]

Yes, for now we just have 2 PR's but they're still on discussing if we should merge it or not.

[mfn]

Took a 2nd look, they're "meta" only anyway and not directly PHP code related so can surely be applied afterwards without much fuzz.

PS: we've three mentions and 3 upvotes 😄

[eschricker]

PR is created: #96

[Messhias]

PR is created: #96

I already approved it, just 2 more approves and we can merge it.

[mfn]

… and all done, thanks all for your participation and of course @eschricker doing the work 🙏🏼