godot icon indicating copy to clipboard operation
godot copied to clipboard

Refactor signal documentation to improve clarity.

Open Manik2607 opened this issue 1 year ago • 8 comments

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

  • Bugsquad edit, fixes: #97221

Manik2607 avatar Sep 23 '24 10:09 Manik2607

Please squash your commits into one, see here

AThousandShips avatar Sep 23 '24 15:09 AThousandShips

You broke your branch by a bad rebase, to fix this do:

git reset --hard 55262a6

And try again to rebase and squash

Remember to push with git push --force when you do

In the future make sure to make a new branch for each PR

AThousandShips avatar Sep 23 '24 17:09 AThousandShips

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

AThousandShips avatar Sep 23 '24 17:09 AThousandShips

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.

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

Manik2607 avatar Sep 23 '24 17:09 Manik2607

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 avatar Sep 23 '24 17:09 AThousandShips

There! Now everything is good!

AThousandShips avatar Sep 23 '24 17:09 AThousandShips

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.

Manik2607 avatar Sep 23 '24 17:09 Manik2607

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

AThousandShips avatar Sep 23 '24 17:09 AThousandShips

Thanks! And congrats for your first merged Godot contribution :tada:

akien-mga avatar Sep 24 '24 11:09 akien-mga