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 typo (copy-paste) in gui_using_fonts.rst #10428

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

The-oldone
Copy link
Contributor

Edited the fourth option to accurately represent which option it is, it previously replicated the third option

Edited the fourth option to accurately represent which option it is, it previously replicated the third option
@tetrapod00 tetrapod00 changed the title Update gui_using_fonts.rst Fix typo (copy-paste) in gui_using_fonts.rst Dec 19, 2024
@tetrapod00 tetrapod00 added bug area:manual Issues and PRs related to the Manual/Tutorials section of the documentation topic:gui cherrypick:4.3 labels Dec 19, 2024
@tetrapod00 tetrapod00 merged commit dedc5e8 into godotengine:master Dec 19, 2024
1 check passed
@tetrapod00
Copy link
Contributor

Thanks!

FYI you might want to start using branches for your PRs rather than your master branch

@The-oldone
Copy link
Contributor Author

The-oldone commented Dec 20, 2024

sure, I will try and do that, just to confirm however, do you mean making a branch of the master, making the changes, then merging it back to master and then opening a pull request or making the changes, and opening a pull request for that branch directly to this repository's master so that the master branch of my repository doesn't get outdated in case of a rejection?

@tetrapod00
Copy link
Contributor

The second option you mentioned. In your fork, make a new branch (from master) just for whatever change you're making. Then make the PR from that branch to this repository's master. The message shown at the top of the created pull request will look something like "The-oldone wants to merge 1 commit into godotengine:master from The-oldone:branch-just-for-pr" rather than "The-oldone wants to merge 1 commit into godotengine:master from The-oldone:master"

@The-oldone
Copy link
Contributor Author

Aight thank you, will do

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:gui
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants