Skip to content

Sync with upstream @ 273e47b7 #2

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

Conversation

javascript-translate-bot

This PR was automatically generated.
Merge changes from en.javascript.info at 273e47b

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

We recommend to close this PR and merge conflicting changes manually.

The steps are:

  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 them. Otherwise, following commands can help:
    • Checkout translated version of a file/folder at the given path:
      • git checkout --ours <path>
    • Checkout upstream version of a file/folder at the given path:
      • git checkout --theirs <path>
    • See what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
  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).

Lim and others added 23 commits April 21, 2019 21:56
BEFORE
"3. When this happens, a special “object wrapper” IS CREATED that provides the extra functionality, and then is destroyed."
AFTER
"3. When this happens, a special “object wrapper” that provides the extra functionality IS CREATED, and then is destroyed."
Updated article.md (better sentence flow)
Change function name "random" to its proper name "randomInteger"
@CLAassistant
Copy link

CLAassistant commented Apr 25, 2019

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

✅ Violet-Bora-Lee
❌ dragonwocky
❌ tadjik1
❌ iliakan
❌ him2312
❌ mihansweatpants
❌ alaabouayed
❌ cmdlhz
❌ lex111
❌ h-n-y
You have signed the CLA already but the status is still pending? Let us recheck it.

javascript-translate-bot pushed a commit that referenced this pull request Sep 2, 2019
javascript-translate-bot pushed a commit that referenced this pull request Sep 9, 2019
javascript-translate-bot pushed a commit that referenced this pull request Mar 24, 2020
Repo Update 4-Aug, 2018
theBstar added a commit that referenced this pull request Jul 16, 2020
www-learn-en pushed a commit that referenced this pull request Jun 15, 2021
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.