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

Change if false to if true "Emoji and Symbols" menu is enabled. #102042

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

ChildLearningClub
Copy link
Contributor

@ChildLearningClub ChildLearningClub commented Jan 25, 2025

Under LineEdit Class Emoji Menu Enabled Property

Screenshot 2025-01-26 052721

Will now read: If true, "Emoji and Symbols" menu is enabled.

@ChildLearningClub ChildLearningClub requested a review from a team as a code owner January 25, 2025 21:56
Copy link
Member

@bruvzg bruvzg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TextEdit.xml have the same line, and also should have true.

@bruvzg bruvzg added this to the 4.4 milestone Jan 25, 2025
@ChildLearningClub
Copy link
Contributor Author

TextEdit.xml have the same line, and also should have true.

Should I go ahead and do the same for this? @bruvzg

@bruvzg
Copy link
Member

bruvzg commented Jan 25, 2025

Should I go ahead and do the same for this?

Yes.

@ChildLearningClub
Copy link
Contributor Author

ChildLearningClub commented Jan 25, 2025

okay made the changes to the file and ran git add . and git commit again but still only show this pull request? Sorry first time?
Edit: never mind didn't git push

@bruvzg
Copy link
Member

bruvzg commented Jan 25, 2025

Please squash the commits, see Pull request workflow for details.

@ChildLearningClub
Copy link
Contributor Author

Okay, think i did that right?

@AThousandShips AThousandShips changed the title Changed if false to if true "Emoji and Symbols" menu is enabled. Change if false to if true "Emoji and Symbols" menu is enabled. Jan 26, 2025
@bruvzg
Copy link
Member

bruvzg commented Jan 27, 2025

Okay, think i did that right?

Commit message still have text from both old commits:

Changed if false to if true "Emoji and Symbols" menu is enabled.
Changed if false to if true "Emoji and Symbols" menu is enabled. Squashed into commit 1

Pleas amend it to Changed if false to if true "Emoji and Symbols" menu is enabled.. Everything else seems to be OK.

@ChildLearningClub ChildLearningClub force-pushed the master branch 2 times, most recently from b2bda70 to eef17e0 Compare January 27, 2025 19:39
@ChildLearningClub
Copy link
Contributor Author

How does this look now?

@bruvzg
Copy link
Member

bruvzg commented Jan 27, 2025

Something gone wrong, seems like you have merged msater instead of rebasing.

@ChildLearningClub
Copy link
Contributor Author

I hope what I did fixed it?

git log --oneline

eef17e0c35 (HEAD -> master, origin/master, origin/HEAD) Changed if false to if true "Emoji and Symbols" menu is enabled.b15b24b087 (upstream/master) Merge pull request #101688 from TCROC/fix-gpu-particles-2d-set_one_shot-seed-randomization
b298f6f479 Merge pull request #101936 from Hilderin/disable-game-embedding-single-window-mode

git reset --hard eef17e0c35

git checkout master

then I did a git fetch origin, git rebase origin/master and lastly, git push --force.

@akien-mga
Copy link
Member

then I did a git fetch origin, git rebase origin/master and lastly, git push --force.

This didn't work, because your origin is your own fork, so rebasing on origin/master is rebasing on the branch you used to make this PR (so no change).

You need to add the upstream Godot repo as a remote and rebase on top of that one:

git remote add upstream https://github.com/godotengine/godot
git fetch upstream master
git rebase upstream/master
git push --force

I did this locally and updated your fork's branch directly (GitHub allows maintainer to do this by default, unless disabled when opening the PR).

One last thing before merging:

Your commit seems not to be linked to your GitHub account. See: Why are my commits linked to the wrong user? for more info.

You can add the email used for this commit in your GitHub settings and it should then appear as authored by you. Alternatively the email can be changed to your GitHub account's anonymous email, I can do this if you want.

@ChildLearningClub
Copy link
Contributor Author

I updated my email to match the git config, thank you. Definitely need to get more familiar with the whole Git process.

@Repiteo Repiteo merged commit ab67fd7 into godotengine:master Jan 28, 2025
19 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Jan 28, 2025

Thanks! Congratulations on your first merged contribution! 🎉

@ChildLearningClub
Copy link
Contributor Author

I really appreciate all the work everyone is putting into this project, Thank you! A really great program and community, I’m happy to be part of it :)

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

Successfully merging this pull request may close these issues.

4 participants