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

Add missing word to text of the alert dialog #79381

Conversation

WiseNoodle
Copy link
Contributor

@WiseNoodle WiseNoodle commented Jul 12, 2023

I hope I followed all the guidelines correctly.

@AThousandShips
Copy link
Member

You will need to squash your commits, see here

@AThousandShips AThousandShips added this to the 4.2 milestone Jul 12, 2023
@WiseNoodle
Copy link
Contributor Author

Reverting commits is confusing. If I didn't do It correctly close this and i'll redo it

@AThousandShips AThousandShips added cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Jul 12, 2023
@AThousandShips
Copy link
Member

You will need to do git rebase -i master and then write "fixup" in front of the other commits

@WiseNoodle
Copy link
Contributor Author

Like so? (forgive me I'm still learning git)
image

@AThousandShips
Copy link
Member

No replace "pick" with "fixup" except for the first one

@AThousandShips
Copy link
Member

so:

pick ... Added missing word ...
fixup ... removed self comment
fixup ... removed self comment
fixup ... Merged ...

@AThousandShips
Copy link
Member

Then you need to do git push -f

@WiseNoodle
Copy link
Contributor Author

I'm trying my best lol, I'm kinda lost rn; It says everything is up to date when i push

@WiseNoodle
Copy link
Contributor Author

Oh boy, i have definitely messed something up
image

@AThousandShips
Copy link
Member

You wrote "it" instead of "git"

@WiseNoodle
Copy link
Contributor Author

this is painful for you to watch im sure, my apologies.

@Sauermann
Copy link
Contributor

Don't worry, git has a bit of a learning curve. But it helps to learn the basics.

@AThousandShips
Copy link
Member

Not at all, there was a time when I was getting used to it too

@WiseNoodle
Copy link
Contributor Author

I have made a grave mistake. I ran a recursive delete on all files trying to remove all commits (followed error message suggestion?) so please discard this pull request and let me start fresh

@WiseNoodle
Copy link
Contributor Author

(recloning, give me a few)

@WiseNoodle
Copy link
Contributor Author

Okay, it finished downloading. I have a fresh slate. I just need to sync it with what we've done so far right?

@AThousandShips
Copy link
Member

Yes you just pull this branch from your repository

@WiseNoodle
Copy link
Contributor Author

Okay, I have now pulled that branch from my fork

@WiseNoodle WiseNoodle force-pushed the fix-wording-of-missing-file-or-dependencies-alert branch from c1b43f5 to a789d0b Compare July 12, 2023 15:21
@WiseNoodle
Copy link
Contributor Author

HA got it!

@WiseNoodle
Copy link
Contributor Author

now jes gotta change the text...

@WiseNoodle
Copy link
Contributor Author

oh wait

@WiseNoodle
Copy link
Contributor Author

it is XD

@WiseNoodle
Copy link
Contributor Author

What's GitHub doing right now? Is it checking all os versions?? That's so cool

@AThousandShips
Copy link
Member

It's running a lot of automated tests! Compiling it all and stuff, it's really cool

@WiseNoodle
Copy link
Contributor Author

That's amazing, so is there anything else I need to do?

@AThousandShips
Copy link
Member

Shouldn't be, the checks should pass, and I will give this a review

@WiseNoodle
Copy link
Contributor Author

In hindsight, I should have compiled and run a test of it before comitting it... But it's just a sting of text, it should be fine if the dialog was made to scale with the text.

@AThousandShips
Copy link
Member

In the future that's a great thing to do, to catch errors and things

@WiseNoodle
Copy link
Contributor Author

WiseNoodle commented Jul 12, 2023

Question: Does this change get applied in the next update (e.g. 4.1.1 or 4.2) or is it an instant bugfix?

@YuriSizov YuriSizov changed the title Added missing word to text of the alert dialog Add missing word to text of the alert dialog Jul 12, 2023
@YuriSizov
Copy link
Contributor

YuriSizov commented Jul 12, 2023

Question: Does this change get applied in the next update (e.g. 4.1.1 or 4.2)?

It will probably be included in both.

FYI, the email that you've used to author your commit is invalid (wisenoodle21@gmail, missing .com). Which means it will not be counted towards your personal contributions on GitHub. You should be able to fix that using git commit --amend --author="Your Name <your_correct_email>" and then force-pushing again. You should also change your local git settings to make sure this doesn't happen in future.

PS. Please use the "Edit" button on GitHub and avoid multiposting. Each message that you send creates a notification for a lot of people. If you need live assistance, consider joining contributors chat at https://chat.godotengine.org!

@WiseNoodle WiseNoodle force-pushed the fix-wording-of-missing-file-or-dependencies-alert branch from a789d0b to d98fa6b Compare July 12, 2023 15:51
@AThousandShips
Copy link
Member

You deleted the message, please update it to fit the PR title with git commit --amend

@WiseNoodle WiseNoodle force-pushed the fix-wording-of-missing-file-or-dependencies-alert branch from d98fa6b to d1c70cf Compare July 12, 2023 15:54
@YuriSizov YuriSizov merged commit 60f3b79 into godotengine:master Jul 12, 2023
13 checks passed
@WiseNoodle WiseNoodle deleted the fix-wording-of-missing-file-or-dependencies-alert branch July 12, 2023 19:13
@YuriSizov
Copy link
Contributor

Thanks! And congrats on your first merged Godot PR!

@AThousandShips
Copy link
Member

Congratulations!

@WiseNoodle
Copy link
Contributor Author

Thank you all so much for all your help, I hope to improve my git skills and continue to contribute in the future!

@YuriSizov YuriSizov removed cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Jul 17, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.1.

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.

Missing word in alert popup
4 participants