Skip to content

Sync with upstream @ b52aa942#86

Merged
3imed-jaberi merged 21 commits into
masterfrom
sync-b52aa942
Jun 18, 2020
Merged

Sync with upstream @ b52aa942#86
3imed-jaberi merged 21 commits into
masterfrom
sync-b52aa942

Conversation

@javascript-translate-bot

@javascript-translate-bot javascript-translate-bot commented Jun 15, 2020

Copy link
Copy Markdown

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

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.

damage92 and others added 18 commits June 2, 2020 11:57
The english websocket article was missing an "in". I fixed it for you. :)
Just a simple check to see if the code works on the example given in the task.
On task.md, " -9  " has 2 white spaces before "-9".
The phrase `zero becames 100.` make me think that there is a variable `zero` defined when there is not.
Update phrasing on "Comparison with ||"
Grammar fix: Missing "is" in websocket EN article
Add test cases for 1-js/06-advanced-functions/03-closure/9-sort-by-field
Match the solution with the question on "Type conversions" task
Grammar and typo fix in pointer events
@CLAassistant

CLAassistant commented Jun 15, 2020

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 7 committers have signed the CLA.

✅ 3imed-jaberi
✅ iliakan
❌ michaelborn
❌ dharohar-rathore
❌ damage92
❌ diegotc86
❌ Logan-Schelly
You have signed the CLA already but the status is still pending? Let us recheck it.

@3imed-jaberi 3imed-jaberi 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.

Ready to merge 🚀

@3imed-jaberi 3imed-jaberi merged commit 3d9ac01 into master Jun 18, 2020
@3imed-jaberi 3imed-jaberi deleted the sync-b52aa942 branch June 18, 2020 22:07
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.

9 participants