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

Refactor signal documentation to improve clarity. #97357

Merged
merged 1 commit into from
Sep 24, 2024

Conversation

Manik2607
Copy link
Contributor

@Manik2607 Manik2607 commented Sep 23, 2024

added the description mentioned in #97221.
please let me know if any changes are needed.

@Manik2607 Manik2607 requested a review from a team as a code owner September 23, 2024 10:43
@AThousandShips AThousandShips changed the title Fixed #97221. Refactor signal documentation to improve clarity. Refactor signal documentation to improve clarity. Sep 23, 2024
Copy link
Member

@AThousandShips AThousandShips left a comment

Choose a reason for hiding this comment

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

Please remove the issue reference from the commit message

doc/classes/Signal.xml Outdated Show resolved Hide resolved
@AThousandShips AThousandShips added enhancement documentation cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Sep 23, 2024
@AThousandShips AThousandShips added this to the 4.4 milestone Sep 23, 2024
@AThousandShips
Copy link
Member

Please squash your commits into one, see here

@AThousandShips

This comment was marked as resolved.

@AThousandShips AThousandShips removed request for a team September 23, 2024 17:08
@AThousandShips AThousandShips removed request for a team September 23, 2024 17:08
@AThousandShips
Copy link
Member

You still need to squash your changes and push them with git push --force

@Manik2607
Copy link
Contributor Author

i am really sorry for all the trouble but i am really lost.
in my git log there is only 2 commits from me but on github it is saying 3 commits ahead.

55262a6 (HEAD -> master, origin/master, origin/HEAD) Refactor signal documentation to improve clarity
d5b37f7 Merge branch 'godotengine:master' into master
4254946 (upstream/master) Merge pull request #97323 from timothyqiu/drop-unicode-identifier
2017006 Merge pull request #97314 from tetrapod00/visual-shader-remap
2c1b8dd Merge pull request #97284 from timothyqiu/optimized-translation-gen
c47eb5c Merge pull request #97282 from timothyqiu/force-advanced-settings-when-searching

@AThousandShips
Copy link
Member

AThousandShips commented Sep 23, 2024

Because you included merge commits, you should rebase on to of upstream/master, or you can reset to upstream master and make the changes again, making sure to use the correct message, and then pushing with force

You can also do:

git reset --hard 99a22c83f4e0f61d7f4f6e4a2f3ca70af4f4cba9

And then fix the commit message and content

@AThousandShips
Copy link
Member

There! Now everything is good!

@Manik2607
Copy link
Contributor Author

Thank you for all the help. It would have taken you 2 minutes to fix but instead you helped me fix it.
I will try not to repeat these mistakes again.

@AThousandShips
Copy link
Member

We try to use all opportunities for learning even if it takes a bit longer, good work figuring it out, git can be a maze

@akien-mga akien-mga merged commit 63d16a9 into godotengine:master Sep 24, 2024
19 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release documentation enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Signal is not created in specified object
4 participants