Skip to content

Sync with upstream @ d6e88647 #74

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 348 commits into from
Closed

Conversation

javascript-translate-bot

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

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

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 26 commits October 11, 2020 17:16
Make a solution of 1.5.5 task more correct
Fix a typo in a 1.5.5 task solution
Mention arr.flat()/arr.flatMap() in 1.5.5
Add a note on some()/every() short circuit
Fix some possible typos and omissions in 1.5.5
Make code example more realistic and safe
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
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Oct 19, 2020
@javascript-translate-bot javascript-translate-bot requested a review from a team October 19, 2020 05:01
@CLAassistant
Copy link

CLAassistant commented Oct 19, 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 8 committers have signed the CLA.

✅ iliakan
✅ vsemozhetbyt
✅ leviding
✅ joaquinelio
❌ Taruna06
❌ lex111
❌ paroche
❌ dorelljames
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
Labels
review needed Review needed, please approve or request changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.