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/01-getting-started/4-devtools/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 andgit 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 <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
When conflicts resolved, commit them andgit push origin master

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

Paramesh-T-Sand others added16 commits

March 29, 2025 13:43

Fix for #3826 - Removed errorception.com from the respective md file.

4c4598b

Removedhttps://errorception.com/ from the md file as it is no longer operational.

Update Safari settings screenshots

cde189d

Update Safari devtools instructions

78c6c44

Update Function object, NFE article

e88c212

Fix minor typo in Function object, NFE article.

Merge pull request #3830 from Paramesh-T-S/Issue_fix_Outdate_-link_in…

a711a1f

…_JS_topic_Error-handlingFix for #3826 - Removed errorception.com from the respective md file.

sentry.io added as per suggestion -javascript-tutorial/en.javascript…

efaa9aa

….info#3830 (comment)

Merge pull request #3835 from Paramesh-T-S/Issue_fix_Outdate_-link_in…

6cc5077

…_JS_topic_Error-handlingsentry.io added as per suggestion

Update article.md

81cfee9

Fix minor typo in Function binding article.

Merge pull request #3836 from rahulrao0209/patch-3

e2d8ebe

Update article.md

Merge pull request #3834 from rahulrao0209/patch-2

6bbdd0c

Update Function object, NFE article

Merge pull request #3832 from dangerman/update-safari-devtools-screen…

d3c395c

…shotUpdate Safari dev tools setup instructions

Replace with up to date screenshots

540d753

Fix minor typo

5629b6b

Update 1-js/09-classes/06-instanceof/article.md

a9864a5

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Merge pull request #3871 from wjw020206/path-3

51bc6d3

Fix minor typo

merging all conflicts

c1837c6

Copy link

CLAassistant commentedNov 3, 2025

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign ourContributor License Agreement before we can accept your contribution.
3 out of6 committers have signed the CLA.

✅ iliakan
✅ wjw020206
✅ smith558
❌ dangerman
❌ Paramesh-T-S
❌ rahulrao0209
_{You have signed the CLA already but the status is still pending? Let usrecheck it.}