Retiring master

[fu]

We have two main branches in the Dreamwidth repositories: master and develop.

master was intended to be used but... never really got any love.

So here's what I propose: remove all the instructions in our documentation which mention master, and just have 'develop`.

Since develop is where all work goes, nothing in the dev workflow will officially change. But occasionally we have accidents where master gets merged into developinstead of the other way around, or someone finds themselves on master when they should be on develop instead -- and removing any mention of master from our instructions should prevent that from ever happening again.

As for what will happen to master... we never actually used it, and at this point ingrained habits for develop + all setups old and new assume develop, so I suggest we continue not using master the way we currently do.

Comments

[stormerider]

I thought that develop was where the code got changed, but master was what got pushed to the site?

[foxfirefey]

It was the original plan but I think it never ended up getting updated.

[fu]

Originally master was supposed to be "latest stable" but in practice we never really decided what latest stable meant so we didn't ever use it much.

[fu]

develop is where the code gets changed, but we make release branches off it and the latest release branch is what's pushed on the site.