Skip to content

Sync with upstream @ 72aa4f0b - #245

Closed
javascript-translate-bot wants to merge 857 commits into
masterfrom
sync-72aa4f0b
Closed

Sync with upstream @ 72aa4f0b#245
javascript-translate-bot wants to merge 857 commits into
masterfrom
sync-72aa4f0b

Conversation

@javascript-translate-bot

Copy link
Copy Markdown

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

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 152 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.

iliakan and others added 30 commits May 3, 2022 23:44
Fix grammar in 'Symbol type' article
Fix language in 'Methods of primitives' task
http://usejsdoc.org seems to be a dead link parked on godaddy atm.

> usejsdoc.org
> is parked free, courtesy of GoDaddy.com.
> Get This Domain

swapped to the link listed in the repo: https://github.com/jsdoc/jsdoc#for-more-information
Small grammatical tweaks to garbage collection
iliakan and others added 28 commits August 14, 2022 11:25
feat: improve type conversion for string with whitespace
Update the operator precedence table
Update conditions for choosing between toString and valueOf
Add Number.isNaN and Number.isFinite
Fix typos in array methods article.md
@CLAassistant

CLAassistant commented Aug 15, 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.
3 out of 14 committers have signed the CLA.

✅ leviding
✅ iliakan
✅ betofc89
❌ kushanksriraj
❌ romanstetsyk
❌ bhushan
❌ chilipenko
❌ LarsiParsii
❌ gionny96
❌ rmarasigan
❌ SUPERustam
❌ vcodepro
❌ peterhauke
❌ 110nard0
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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.