javascript-tutorial / pt-PT-deleted.javascript.info

Please use https://github.com/javascript-tutorial/pt.javascript.info
https://github.com/javascript-tutorial/pt.javascript.info
Other
0 stars 0 forks source link

Sync with upstream @ 273e47b7 #2

Closed javascript-translate-bot closed 5 years ago

javascript-translate-bot commented 5 years ago

This PR was automatically generated. Merge changes from en.javascript.info at 273e47b7

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 commented 5 years ago

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

:white_check_mark: Violet-Bora-Lee
:x: candh
:x: JohnMcGuinness
:x: dragonwocky
:x: tadjik1
:x: iliakan
:x: him2312
:x: mihansweatpants
:x: alaabouayed
:x: cmdlhz
:x: lex111
:x: h-n-y
You have signed the CLA already but the status is still pending? Let us recheck it.