Skip to content

Conversation

javascript-translate-bot

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

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.

peachesontour and others added 30 commits September 21, 2020 18:25
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
vsemozhetbyt and others added 22 commits November 27, 2020 16:47
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Replace deprecated property in 5.9 (Resumable file upload)
Expand a note in 5.8 (XMLHttpRequest)
Fix typos in 5.8 (XMLHttpRequest)
Add missing parenthesis in 5.6 (Fetch API)
Copy link
Contributor

@odsantos odsantos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts checked.

@odsantos odsantos merged commit 118b67d into master Nov 30, 2020
@odsantos odsantos deleted the sync-e1a3f634 branch November 30, 2020 18:53
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.