-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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 typos present in '@theia/core' #6912
Conversation
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.
Thank you for taking care of the issue! 👍
Please be sure to address the minor comment, and please squash your commits into one.
Also for future reference, you can put Fixes: #6899
or other keywords in your commit message so the corresponding issue is tracked and closed on merge.
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.
Thank you for the changes, I look forward to many more contributions from you in the future!
@JustinAng1 when you get a chance, do you mind fixing the conflicts of the pull-request so it can be merged? |
Sure, here's what I plan to do:
Please let me know if there's any issues to this approach. |
Since you are working off a fork, my approach would be to:
|
Please note that we cannot merge the pull-request until the conflicts have been resolved, and commits are squashed (single commit). |
Sorry, I'm a little confused. I merged the fork using github's tool, but now there's two commits. Should I try and resolve this using rebase (Something like git rebase HEAD~2)? Or should I attempt to roll back the repository to my last commit then merge it manually. |
You can do however you feel most comfortable with :) |
Issue: #6899
What it does
Review checklist
Reminder for reviewers