Skip to content

Sync with upstream @ 99e59ba6#260

Merged
HachemiH merged 144 commits intomasterfrom
sync-99e59ba6
Nov 23, 2020
Merged

Sync with upstream @ 99e59ba6#260
HachemiH merged 144 commits intomasterfrom
sync-99e59ba6

Conversation

@javascript-translate-bot
Copy link
Copy Markdown

@javascript-translate-bot javascript-translate-bot commented Nov 16, 2020

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

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 34 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

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

joaquinelio and others added 30 commits October 12, 2020 06:36
This updates a small grammar error and adds some helpful info. Hoping it's better now. Let me know if you need any more changes and I'll update it immediately.
Updated based on suggestion on issue #1769
Update 2-ui/4-forms-controls/1-form-elements/article.md
iliakan and others added 20 commits November 10, 2020 12:09
Fix typos in 'Proxy and Reflect'
Fix outdated note in 1.99.04 (Reference Type)
Correct solution explanation in 1.99.04 (Reference Type)
Fix link in 2.1.5 (Node properties...)
It can be more readable with same line of code. There was a lot of nested parenthesis.
Fix a typo in 1.11.3 (Promises chaining)
Fix typo in 2.1.6 (Attributes and properties)
fix typo in 06-promisify article.md
Fix typos in 2.1.4 (Searching elements)
Fix a typo in 1.6.1 task solution
OPT: change "false" to "falsy"
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Nov 16, 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.
4 out of 7 committers have signed the CLA.

✅ vsemozhetbyt
✅ leviding
✅ iliakan
✅ HachemiH
❌ wam
❌ ZhaoMuwei
❌ lumosmind
You have signed the CLA already but the status is still pending? Let us recheck it.

@HachemiH HachemiH self-assigned this Nov 23, 2020
@HachemiH HachemiH merged commit c653d1a into master Nov 23, 2020
@HachemiH HachemiH deleted the sync-99e59ba6 branch January 2, 2021 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.