Skip to content

Sync with upstream @ 29a3c58d - #3

Merged
mehradsadeghi merged 405 commits into
masterfrom
sync-29a3c58d
May 15, 2019
Merged

Sync with upstream @ 29a3c58d#3
mehradsadeghi merged 405 commits into
masterfrom
sync-29a3c58d

Conversation

@javascript-translate-bot

@javascript-translate-bot javascript-translate-bot commented May 11, 2019

Copy link
Copy Markdown

This PR was automatically generated.
Merge changes from en.javascript.info at 29a3c58

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 the translated version of a file/folder at the given path (ditches 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

Please ignore changes in Readme.md (git checkout --ours Readme.md && git commit -m ignore Readme.md).

iliakan and others added 30 commits March 31, 2019 20:10
Small Grammatical Error - article.md "Class"
The previous link was DEPRECATED
Update to improve clarity and avoid confusion.
@CLAassistant

CLAassistant commented May 11, 2019

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

✅ mehradsadeghi
❌ lex111
❌ rezyx
❌ iliakan
❌ luc4leone
❌ quangnd
❌ Zyranivia
❌ deniolp
❌ sparkofreason
❌ alienfernandez
❌ gongzemin
You have signed the CLA already but the status is still pending? Let us recheck it.

@mehradsadeghi
mehradsadeghi merged commit b7b4b01 into master May 15, 2019
javascript-translate-bot pushed a commit that referenced this pull request Mar 24, 2020
Update repo 04-Sept-2018
@mehradsadeghi
mehradsadeghi deleted the sync-29a3c58d branch July 3, 2020 03:03
mahdiHash pushed a commit that referenced this pull request Aug 20, 2023
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.