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

Fix improper format in Code Block in gdscript_basics.rst #10461

Merged

Conversation

karmaral
Copy link
Contributor

@karmaral karmaral commented Jan 3, 2025

This PR closes #10460.

The code block wasn't rendering because it was missing its first blank line. I also deleted an extra stray line before it for consistency.

@karmaral karmaral changed the title Update gdscript_basics.rst Fix improper format in Code Block in gdscript_basics.rst Jan 3, 2025
@tetrapod00 tetrapod00 added bug topic:gdscript area:manual Issues and PRs related to the Manual/Tutorials section of the documentation cherrypick:4.3 labels Jan 3, 2025
@mhilbrunner mhilbrunner merged commit 2f69288 into godotengine:master Jan 3, 2025
1 check passed
@mhilbrunner
Copy link
Member

Thanks! Merged.

@karmaral
Copy link
Contributor Author

karmaral commented Jan 7, 2025

Hey @mhilbrunner ! Quick question as I'm not entirely familiar with the workflow - I noticed the changes are on latest, should I make a PR that targets the stable branch too? Or does that get updated differently?

@tetrapod00
Copy link
Contributor

tetrapod00 commented Jan 7, 2025

@karmaral No need for you to make a PR that targets 4.3 or stable. As a general rule, changes always target the master branch, which becomes the latest branch on the website. Once the 4.4 release is finalized, the current state of master gets branched off into a 4.4 branch.

At some point, we'll manually backport or "cherrypick" a batch of the changes from latest to 4.3 (which is the source of truth) and then to stable (which is just a mirror of the current state of 4.3). There's no need for you to create another PR to do that yourself.

Historically, sometimes there is a wait of weeks or more before changes are actually cherrypicked, because the process is manual. But we're trying out a workflow that requires a little less manual work: #10361.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:manual Issues and PRs related to the Manual/Tutorials section of the documentation bug cherrypick:4.3 topic:gdscript
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code block not rendering in gdscript_basics.rst
3 participants