Skip to content

Conversation

@javascript-translate-bot
Copy link

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

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

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 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

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

@CLAassistant
Copy link

CLAassistant commented May 30, 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.
1 out of 12 committers have signed the CLA.

✅ iliakan
❌ GodAzaldin
❌ alfiya-udc
❌ maurodibert
❌ nabaraj
❌ Violet-Bora-Lee
❌ KenjiI
❌ T1mL3arn
❌ lex111
❌ vasilevx
❌ tonchique
❌ skmetaly
You have signed the CLA already but the status is still pending? Let us recheck it.

@thickkoezz thickkoezz deleted the sync-08734734 branch October 19, 2019 19:39
@thickkoezz thickkoezz self-assigned this Oct 19, 2019
javascript-translate-bot pushed a commit that referenced this pull request Mar 24, 2020
yoga1234 added a commit that referenced this pull request Oct 3, 2022
Merge pull request #285 from yoga1234/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.