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

fix typos present in '@theia/core' #6912

Closed
wants to merge 0 commits into from
Closed

fix typos present in '@theia/core' #6912

wants to merge 0 commits into from

Conversation

justin8502
Copy link
Contributor

Issue: #6899

What it does

  • fixes various typos throughout the codebase.

Review checklist

Reminder for reviewers

Copy link
Member

@vince-fugnitto vince-fugnitto left a 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.

@vince-fugnitto vince-fugnitto added core issues related to the core of the application documentation issues related to documentation quality issues related to code and application quality labels Jan 20, 2020
Copy link
Member

@vince-fugnitto vince-fugnitto left a 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!

@vince-fugnitto
Copy link
Member

@JustinAng1 when you get a chance, do you mind fixing the conflicts of the pull-request so it can be merged?

@justin8502
Copy link
Contributor Author

Sure, here's what I plan to do:

  1. Pull from upstream repository
  2. Merge + keep both changes to CHANGELOG
  3. Push to master

Please let me know if there's any issues to this approach.

@vince-fugnitto
Copy link
Member

Please let me know if there's any issues to this approach.

Since you are working off a fork, my approach would be to:

  1. sync your fork against the upstream (this repo's) master:
  2. rebase your changes against the master
  3. fix the conflicts
  4. amend your pull-request
  5. force push your changes

@vince-fugnitto
Copy link
Member

Please note that we cannot merge the pull-request until the conflicts have been resolved, and commits are squashed (single commit).

@justin8502
Copy link
Contributor Author

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.

@vince-fugnitto
Copy link
Member

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 :)
The only thing to make sure is that commits are squashed (unless there are multiple commits for a specific reason) and that there are no merge conflicts before we are able to successfully merge.

@justin8502 justin8502 closed this Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core issues related to the core of the application documentation issues related to documentation quality issues related to code and application quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants