Sync with upstream @ 19223ae7#3
Closed
javascript-translate-bot wants to merge 604 commits into
Closed
Conversation
For consistency with the rest of the document and the "coding style" chapter
Added a space after "for"
there was a typo
Just a little typos
fixing getting "wateramount"
Fix name of JavaScript
Corrected grammar
#8: fix unordered list
Typo: F.property => F.prototype
Update article.md
Update article.md
Update article.md
|
|
javascript-translate-bot
pushed a commit
that referenced
this pull request
Mar 24, 2020
Update repo 04-Sept-2018
longo-andrea
pushed a commit
that referenced
this pull request
Jan 26, 2021
Article/11 logical operators
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated.
Merge changes from en.javascript.info at 19223ae
The following files have conflicts and may need new translations:
Click to open a list of 53 files
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:
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git checkout --theirs <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterPlease ignore changes in Readme.md (git checkout --ours Readme.md && git commit -m ignore Readme.md).