Skip to content

Sync with upstream @ 291b5c05#95

Merged
ipapoutsidis merged 75 commits intomasterfrom
sync-291b5c05
Apr 22, 2022
Merged

Sync with upstream @ 291b5c05#95
ipapoutsidis merged 75 commits intomasterfrom
sync-291b5c05

Conversation

@javascript-translate-bot
Copy link
Copy Markdown

This PR was automatically generated to merge changes from en.javascript.info at 291b5c0

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

To merge changes manually (instead of merging this PR):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

This PR will be closed and replaced with a new one in a few days.

QiyanYu and others added 30 commits February 23, 2022 17:15
Add semi colon for being more clear.
In the previous article, in a similar example, he was
corrected a typo in the article summary
line 301  is --> if
- updated incorrect spellings
- Updated the grammar-related errors
`?.` returns `undefined`
Fix grammatical mistake in Type Conversions section
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Apr 18, 2022

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 14 committers have signed the CLA.

✅ QiyanYu
✅ joaquinelio
✅ ipapoutsidis
✅ iliakan
❌ Rnbsov
❌ apoorvachikara
❌ Omid-Heidarzadeh
❌ guneethind
❌ vabushkevich
❌ sanketshah19
❌ pzolo85
❌ fredden
❌ gnopor
❌ glebmikulko
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link
Copy Markdown
Member

@ipapoutsidis ipapoutsidis left a comment

Choose a reason for hiding this comment

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

Reviewed

@ipapoutsidis ipapoutsidis merged commit faaa8f1 into master Apr 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.