Skip to content

Sync with upstream @ 71da17e5 #116

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

Closed
wants to merge 3,086 commits into from
Closed

Conversation

javascript-translate-bot

This PR was automatically generated to merge changes from en.javascript.info at 71da17e

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:

Click to open a list of 28 files

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

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

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

iliakan and others added 30 commits June 24, 2021 19:41

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
add notes about CSS animation performance

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Add generator.throw, yeah we don't use it much but it's good to know about it.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Sen-442b and others added 26 commits January 29, 2022 18:57

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix formatting, change wording for clarity

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
doc-fix: Modified a misplaced comma

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update unary + (plus) operator precedence explanation

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Minor fix

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Include "us" in article sentence

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fixes localStorage spec link

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fixes operator precedence

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix: bug caused by GitHub data change

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update operator precedence

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix: bug caused by GitHub data change

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update blob article.md
@CLAassistant
Copy link

CLAassistant commented Feb 7, 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.
5 out of 13 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
✅ leviding
✅ buynao
✅ lankerened
❌ Sen-442b
❌ ArSn
❌ justinpage
❌ Omid-Heidarzadeh
❌ ruslauz
❌ jovton
❌ robertmcabee
❌ erolaliyev
You have signed the CLA already but the status is still pending? Let us recheck it.

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.

None yet