Skip to content

Sync with upstream @ 19223ae7 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from

Conversation

javascript-translate-bot

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

@CLAassistant
Copy link

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

❌ marksq
❌ david-cho-lerat-HL2
❌ iliakan
You have signed the CLA already but the status is still pending? Let us recheck it.

@Violet-Bora-Lee
Copy link
Member

Manually Merged.

@Violet-Bora-Lee Violet-Bora-Lee deleted the sync-19223ae7 branch May 9, 2019 04:46
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.

6 participants