Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

strange branch names in github #444

Closed
danmarsden opened this issue Dec 19, 2022 · 4 comments
Closed

strange branch names in github #444

danmarsden opened this issue Dec 19, 2022 · 4 comments

Comments

@danmarsden
Copy link
Contributor

you have a "main" branch which is set to the default branch name but you have a MOODLE_400_STABLE and MOODLE_311_STABLE branches which appear to have "newer" code than the "main" branch does?

maybe you should set the default branch to MOODLE_400_STABLE and delete the "main" branch? - or maybe add some detail to the readme file about what that "main" branch is actually for?

thanks!

@mchurchward
Copy link
Contributor

Hi Dan. I don't use the main branch. It is typically the next unreleased version. But yes, I could use some documentation.
Generally, code is kept up to date in the latest Moodle release branch(es), which is currently MOODLE_400_STABLE (unreleased at the moment), and MOODLE_311_STABLE.

@mchurchward
Copy link
Contributor

That said, I have changed the default to the current working branch. Thanks.

@danmarsden
Copy link
Contributor Author

cool thanks! - having the default branch set to MOODLE_400_STABLE will help a lot to avoid confusion :-)

FYI if it's useful to know how we do it.... we delete the "main" branch completely in lots of our plugins - usually our latest branch will be named using the lowest supported version for that branch eg auth_saml2 has a latest branch name of MOODLE_39_STABLE - because that branch will work in Moodle 3.9 -> 4.1 - if we have to create a new branch to support a new release (eg Moodle 4.1) we create a new branch to cover that release and higher so we might have
MOODLE_39_STABLE (supports 3.9 -> 4.0)
MOODLE_401_STABLE (supports 4.1 and higher)

That way people can use git submodules/subplugins to add our plugins and the branch name doesn't change unless it has to support a new version.

@mchurchward
Copy link
Contributor

Other than deleting the main branch, that is how I do it too. I never considered deleting the main branch. Hmm....

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants