🌐 US-Proxy
class="logged-out env-production page-responsive" style="word-wrap: break-word;" >
Skip to content

Sync with upstream @ 3d7abb9c#755

Merged
joaquinelio merged 7 commits into
masterfrom
sync-3d7abb9c
Mar 19, 2025
Merged

Sync with upstream @ 3d7abb9c#755
joaquinelio merged 7 commits into
masterfrom
sync-3d7abb9c

Conversation

@javascript-translate-bot

Copy link
Copy Markdown

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

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

CLAassistant commented Mar 17, 2025

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@joaquinelio joaquinelio merged commit 00a1ae5 into master Mar 19, 2025
@joaquinelio joaquinelio deleted the sync-3d7abb9c branch March 19, 2025 05:11
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.

6 participants