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

When 2.4 release is planned: Inspect and merge v2.4 feature branch back to develop #5

Open
artntek opened this issue Feb 14, 2024 · 0 comments
Milestone

Comments

@artntek
Copy link
Contributor

artntek commented Feb 14, 2024

we converted the repo structure from the legacy svn setup (trunk branch with separate release branches) to a regular github workflow (main, develop, and feature branches) in Feb 2024.

main contains the code that is currently released and deployed. develop contains newer code for the next release.

The old master (a.k.a. trunk) branch was converted to a feature branch (feature-5-changes-for-v2.4-from-trunk), since it has changes that are not preset in the 2.3.2 release, but may be needed for 2.4.0.

If so, these should be merged back into develop at that time

@artntek artntek added this to the 2.4.0 milestone Feb 14, 2024
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

1 participant