Skip to content

Sync with upstream @ a6fdfda0 - #190

Merged
mahdyar merged 8 commits into
masterfrom
sync-a6fdfda0
Jan 17, 2022
Merged

Sync with upstream @ a6fdfda0#190
mahdyar merged 8 commits into
masterfrom
sync-a6fdfda0

Conversation

@javascript-translate-bot

@javascript-translate-bot javascript-translate-bot commented Jan 17, 2022

Copy link
Copy Markdown

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

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.

tathienphuoc and others added 7 commits December 21, 2021 18:21
ms - official international name for millisecond. 1 ms = 1 * 10**(-3) second (or 1e-3). Source : https://en.wikipedia.org/wiki/Metric_prefix .
0.000001 or 1e-6 - it's microsecond. Better name for this variable 'mcs' or 'us'. 'mcs' easier to understand.
fix spelling error at line 139: "Lke" to "Like"
@CLAassistant

CLAassistant commented Jan 17, 2022

Copy link
Copy Markdown

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

✅ iliakan
✅ mahdiHash
❌ 11201010
❌ tathienphuoc
❌ NickFallman
You have signed the CLA already but the status is still pending? Let us recheck it.

@mahdyar mahdyar left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

BTW @mahdiHash please check the checkbox for each of the conflicts when you resolve it. (like here)

Thank you!

@mahdyar
mahdyar merged commit 4309102 into master Jan 17, 2022
@mahdyar
mahdyar deleted the sync-a6fdfda0 branch January 17, 2022 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants