Skip to content

Sync with upstream @ 193319c9 #208

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

Merged
merged 26 commits into from
Oct 11, 2021
Merged

Sync with upstream @ 193319c9 #208

merged 26 commits into from
Oct 11, 2021

Conversation

javascript-translate-bot
Copy link
Contributor

@javascript-translate-bot javascript-translate-bot commented Oct 11, 2021

This PR was automatically generated to merge changes from en.javascript.info at 193319c

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

To merge changes manually (instead of merging this PR):

  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

This PR will be closed and replaced with a new one in a few days.

@CLAassistant
Copy link

CLAassistant commented Oct 11, 2021

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

✅ joaquinelio
✅ odsantos
✅ imba-tjd
✅ iliakan
✅ mahdyar
✅ tarasyyyk
❌ wilburn98
❌ baooab
❌ deisner
❌ fionatagious
❌ xirly
❌ rizkyzhang
You have signed the CLA already but the status is still pending? Let us recheck it.

@tarasyyyk tarasyyyk merged commit a015023 into master Oct 11, 2021
@tarasyyyk tarasyyyk deleted the sync-193319c9 branch October 11, 2021 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.