-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
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 menu items that trigger secondary interface missing ellipsis #80355
Fix menu items that trigger secondary interface missing ellipsis #80355
Conversation
Could you amend the commit message to be more explicit? The PR title is good, the commit should use the same title (and can include "Fixes #80347" in the body of the commit message, not in the title). |
I have amended the commit with the requested changes. Let me know if there are any other things that need to be added. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, but needs a rebase.
I'm new to git. How would I rebase because there seems to be a merge conflict in |
That's exactly why you need to do a rebase right now, to resolve those conflicts. When you do a rebase, if there are conflicts that cannot be resolved automatically, you'll be prompted about it and the rebase is going to be put on hold. This allows you to modify the files and decide how to resolve conflicts and then proceed. What do you use to make the changes and to work with git? |
I use Visual Studio Code. I have tried resolving the conflict via the UI but it doesn't seem to be working as expected as it requires me to make another commit which might not look good on the git history. |
@jcovin293 While I'm not sure how it would create a new commit, you can fix that after the fact by doing an interactive rebase and squashing your commits together with the |
You accidentally closed your PR by resetting the branch, if you push to the branch again we can reopen, alternatively you can open a new PR with a single commit containing the changes |
I have pushed a new commit. Do I need to do something to reopen it or is it on your end? |
All is in order now, good job! |
Thanks! And congrats for your first merged Godot contribution 🎉 |
This PR fixes #80347 where menu items that trigger a secondary interface (such as a dialog) do not have an ellipsis on their menu items.