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

PSA: Branches updated to match upstream Godot: 4.x PRs → master / 3.x PRs → 3.x #864

Open
akien-mga opened this issue Feb 28, 2023 · 0 comments

Comments

@akien-mga
Copy link
Member

akien-mga commented Feb 28, 2023

Please note that the branches in this repository have been updated to match the same structure as in https://github.com/godotengine/godot
Information from the updated README:

  • The master branch is compatible with Godot's master development branch (next 4.x release).
  • The 3.x branch is compatible with Godot's 3.x development branch (next 3.x release).
  • The other branches are compatible with the matching stable versions of Godot:
    • 4.0 branch for Godot 4.0.x.
    • 3.5 branch for Godot 3.5.x.
    • 3.4 branch for Godot 3.4.x.
    • 3.3 branch for Godot 3.3.x.
    • 3.2 branch for Godot 3.2.x.
    • 3.1 branch for Godot 3.1.x.
    • 3.0 branch for Godot 3.0.x.
    • 2.1 branch for Godot 2.1.x.

So your PRs for new demos/fixes to existing demos should go to:

  • master if they're meant for 4.0 and later (currently not 4.1-specific demo has been merged, so this branch is in sync with 4.0)
  • 3.x if they're meant for 3.5 and later (currently no 3.6-specific demo has been merged, so this branch is in sync with 3.5)
@akien-mga akien-mga pinned this issue Feb 28, 2023
@Calinou Calinou unpinned this issue Mar 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant