Title: Sync with upstream @ d78b01e9 by javascript-translate-bot · Pull Request #229 · javascript-tutorial/bg.javascript.info · GitHub
Open Graph Title: Sync with upstream @ d78b01e9 by javascript-translate-bot · Pull Request #229 · javascript-tutorial/bg.javascript.info
X Title: Sync with upstream @ d78b01e9 by javascript-translate-bot · Pull Request #229 · javascript-tutorial/bg.javascript.info
Description: This PR was automatically generated to merge changes from en.javascript.info at d78b01e
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:
1-js/02-first-steps/09-comparison/article.md
To merge changes manually (instead of merging this PR):
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
Commit all current work locally and git checkout master
Pull the recent changes from the English version:
git pull upstream master
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
Open Graph Description: This PR was automatically generated to merge changes from en.javascript.info at d78b01e Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge...
X Description: This PR was automatically generated to merge changes from en.javascript.info at d78b01e Conflicted files in this PR have labels ">>>..." with both sides of co...
Opengraph URL: https://github.com/javascript-tutorial/bg.javascript.info/pull/229
X: @github
Domain: patch-diff.githubusercontent.com
| route-pattern | /:user_id/:repository/pull/:id/files(.:format) |
| route-controller | pull_requests |
| route-action | files |
| fetch-nonce | v2:4363b3c5-8fbf-de53-3e9a-4fcafef5d3f0 |
| current-catalog-service-hash | ae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b |
| request-id | E0C8:9DF58:1BB1809:24382E2:6982C971 |
| html-safe-nonce | 8d8a899a4cc3715891082e75a1e9b6a03bb947f87142895e95affdb1186d5c89 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJFMEM4OjlERjU4OjFCQjE4MDk6MjQzODJFMjo2OTgyQzk3MSIsInZpc2l0b3JfaWQiOiI5MDQ4MjIzNjg4OTA1OTAyNDQ5IiwicmVnaW9uX2VkZ2UiOiJpYWQiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0= |
| visitor-hmac | a05c2f8c4751c669e9b2b70d0dc2a4baa4dcebcf16b1c45ef81cdcc11fbbf94e |
| hovercard-subject-tag | pull_request:3234886972 |
| github-keyboard-shortcuts | repository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/javascript-tutorial/bg.javascript.info/pull/229/files |
| twitter:image | https://avatars.githubusercontent.com/u/49596073?s=400&v=4 |
| twitter:card | summary_large_image |
| og:image | https://avatars.githubusercontent.com/u/49596073?s=400&v=4 |
| og:image:alt | This PR was automatically generated to merge changes from en.javascript.info at d78b01e Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge... |
| og:site_name | GitHub |
| og:type | object |
| hostname | github.com |
| expected-hostname | github.com |
| None | c6741528aa4d4ba81c57bbff8f8cc0de0e9115cb2993431dc9dac8d489f7b4ee |
| turbo-cache-control | no-preview |
| diff-view | unified |
| go-import | github.com/javascript-tutorial/bg.javascript.info git https://github.com/javascript-tutorial/bg.javascript.info.git |
| octolytics-dimension-user_id | 49552305 |
| octolytics-dimension-user_login | javascript-tutorial |
| octolytics-dimension-repository_id | 214284903 |
| octolytics-dimension-repository_nwo | javascript-tutorial/bg.javascript.info |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 214284903 |
| octolytics-dimension-repository_network_root_nwo | javascript-tutorial/bg.javascript.info |
| turbo-body-classes | logged-out env-production page-responsive full-width |
| disable-turbo | true |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | df2a3cea9cc9adaf422cd462f5351935c407af4d |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width