Skip to content

Conversation

javascript-translate-bot

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

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.

Herrera-pgoat and others added 30 commits October 22, 2020 16:05
Made it clear what the question was asking from the user.
ESLint 7.12.0 indent rule configuration now only accepts a number value. The array provided returns a runtime error.
A simple fix to better frame the difference between a transpiler and a polyfill.
the match position is 7
It seems there are no polymorphic functions in this chapter.
Fix possibly outdated note in 1.9.6 (instanceof)
Minor clarification on WeakMap and WeakSet
Replace rules.indent array with number
Fix links in 1.8.4 (Prototype methods)
Delete excess semicolon in 1.9.1 (Class basic syntax)
Clarify task code place in 1.9.1 (Class basic syntax)
Add missing semicolons in 1.9.2 (Class inheritance)
@CLAassistant
Copy link

CLAassistant commented Nov 2, 2020

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.
3 out of 8 committers have signed the CLA.

✅ vsemozhetbyt
✅ odsantos
✅ iliakan
❌ Herrera-pgoat
❌ plakxj
❌ mikemitchell574
❌ Youngjin-KimY
❌ DawidKopys
You have signed the CLA already but the status is still pending? Let us recheck it.

@odsantos odsantos merged commit 11d3813 into master Nov 2, 2020
@odsantos odsantos deleted the sync-dccca58f branch November 2, 2020 16:09
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.

9 participants