Skip to content

Sync with upstream @ 19223ae7#7

Merged
HachemiH merged 68 commits intomasterfrom
sync-19223ae7
Apr 29, 2019
Merged

Sync with upstream @ 19223ae7#7
HachemiH merged 68 commits intomasterfrom
sync-19223ae7

Conversation

@javascript-translate-bot
Copy link
Copy Markdown

This PR was automatically generated.
Merge changes from en.javascript.info at 19223ae

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 translated version of a file/folder at the given path:
      • git checkout --ours <path>
    • Checkout upstream version of a file/folder at the given path:
      • git checkout --theirs <path>
    • See what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
  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).

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Apr 26, 2019

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

✅ lex111
✅ Violet-Bora-Lee
❌ candh
❌ JohnMcGuinness
❌ dragonwocky
❌ tadjik1
❌ iliakan
❌ him2312
❌ mihansweatpants
❌ alaabouayed
❌ cmdlhz
❌ h-n-y
❌ marksq
❌ Antiai
❌ david-cho-lerat-HL2
You have signed the CLA already but the status is still pending? Let us recheck it.

@HachemiH HachemiH merged commit 55d016a into master Apr 29, 2019
@HachemiH HachemiH deleted the sync-19223ae7 branch July 27, 2019 11:40
javascript-translate-bot pushed a commit that referenced this pull request Mar 24, 2020
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.