Sync with upstream @ 285083fc

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

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:

Click to open a list of 131 files

- [ ] [1-js/01-getting-started/1-intro/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/1-intro/article.md) - [ ] [1-js/01-getting-started/2-manuals-specifications/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/2-manuals-specifications/article.md) - [ ] [1-js/01-getting-started/3-code-editors/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/01-getting-started/3-code-editors/article.md) - [ ] [1-js/02-first-steps/04-variables/3-uppercast-constant/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/3-uppercast-constant/task.md) - [ ] [1-js/02-first-steps/04-variables/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/04-variables/article.md) - [ ] [1-js/02-first-steps/05-types/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/05-types/article.md) - [ ] [1-js/02-first-steps/07-type-conversions/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/07-type-conversions/article.md) - [ ] [1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.md) - [ ] [1-js/02-first-steps/08-operators/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/08-operators/article.md) - [ ] [1-js/02-first-steps/10-ifelse/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/10-ifelse/article.md) - [ ] [1-js/02-first-steps/12-nullish-coalescing-operator/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/12-nullish-coalescing-operator/article.md) - [ ] [1-js/02-first-steps/13-while-for/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/13-while-for/article.md) - [ ] [1-js/02-first-steps/14-switch/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/14-switch/article.md) - [ ] [1-js/02-first-steps/15-function-basics/1-if-else-required/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/15-function-basics/1-if-else-required/solution.md) - [ ] [1-js/02-first-steps/15-function-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/15-function-basics/article.md) - [ ] [1-js/02-first-steps/16-function-expressions/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/16-function-expressions/article.md) - [ ] [1-js/02-first-steps/17-arrow-functions-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/17-arrow-functions-basics/article.md) - [ ] [1-js/02-first-steps/18-javascript-specials/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/02-first-steps/18-javascript-specials/article.md) - [ ] [1-js/03-code-quality/01-debugging-chrome/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/01-debugging-chrome/article.md) - [ ] [1-js/03-code-quality/03-comments/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/03-comments/article.md) - [ ] [1-js/03-code-quality/05-testing-mocha/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/05-testing-mocha/article.md) - [ ] [1-js/03-code-quality/06-polyfills/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/03-code-quality/06-polyfills/article.md) - [ ] [1-js/04-object-basics/01-object/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/01-object/article.md) - [ ] [1-js/04-object-basics/02-object-copy/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/02-object-copy/article.md) - [ ] [1-js/04-object-basics/03-garbage-collection/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/03-garbage-collection/article.md) - [ ] [1-js/04-object-basics/04-object-methods/7-calculator/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/04-object-methods/7-calculator/task.md) - [ ] [1-js/04-object-basics/04-object-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/04-object-methods/article.md) - [ ] [1-js/04-object-basics/06-constructor-new/2-calculator-constructor/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/06-constructor-new/2-calculator-constructor/task.md) - [ ] [1-js/04-object-basics/06-constructor-new/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/06-constructor-new/article.md) - [ ] [1-js/04-object-basics/07-optional-chaining/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/07-optional-chaining/article.md) - [ ] [1-js/04-object-basics/08-symbol/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/08-symbol/article.md) - [ ] [1-js/04-object-basics/09-object-toprimitive/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/04-object-basics/09-object-toprimitive/article.md) - [ ] [1-js/05-data-types/01-primitives-methods/1-string-new-property/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/01-primitives-methods/1-string-new-property/task.md) - [ ] [1-js/05-data-types/01-primitives-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/01-primitives-methods/article.md) - [ ] [1-js/05-data-types/02-number/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/02-number/article.md) - [ ] [1-js/05-data-types/03-string/1-ucfirst/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/03-string/1-ucfirst/solution.md) - [ ] [1-js/05-data-types/03-string/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/03-string/article.md) - [ ] [1-js/05-data-types/04-array/10-maximal-subarray/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/04-array/10-maximal-subarray/solution.md) - [ ] [1-js/05-data-types/04-array/2-create-array/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/04-array/2-create-array/task.md) - [ ] [1-js/05-data-types/04-array/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/04-array/article.md) - [ ] [1-js/05-data-types/05-array-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/05-array-methods/article.md) - [ ] [1-js/05-data-types/06-iterable/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/06-iterable/article.md) - [ ] [1-js/05-data-types/07-map-set/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/07-map-set/article.md) - [ ] [1-js/05-data-types/08-weakmap-weakset/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/08-weakmap-weakset/article.md) - [ ] [1-js/05-data-types/10-destructuring-assignment/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/10-destructuring-assignment/article.md) - [ ] [1-js/05-data-types/11-date/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/11-date/article.md) - [ ] [1-js/05-data-types/12-json/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/05-data-types/12-json/article.md) - [ ] [1-js/06-advanced-functions/01-recursion/01-sum-to/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/01-recursion/01-sum-to/solution.md) - [ ] [1-js/06-advanced-functions/01-recursion/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/01-recursion/article.md) - [ ] [1-js/06-advanced-functions/02-rest-parameters-spread/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/02-rest-parameters-spread/article.md) - [ ] [1-js/06-advanced-functions/03-closure/5-function-in-if/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/03-closure/5-function-in-if/task.md) - [ ] [1-js/06-advanced-functions/03-closure/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/03-closure/article.md) - [ ] [1-js/06-advanced-functions/05-global-object/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/05-global-object/article.md) - [ ] [1-js/06-advanced-functions/06-function-object/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/06-function-object/article.md) - [ ] [1-js/06-advanced-functions/08-settimeout-setinterval/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/08-settimeout-setinterval/article.md) - [ ] [1-js/06-advanced-functions/09-call-apply-decorators/04-throttle/task.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/09-call-apply-decorators/04-throttle/task.md) - [ ] [1-js/06-advanced-functions/10-bind/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/06-advanced-functions/10-bind/article.md) - [ ] [1-js/07-object-properties/01-property-descriptors/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/07-object-properties/01-property-descriptors/article.md) - [ ] [1-js/07-object-properties/02-property-accessors/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/07-object-properties/02-property-accessors/article.md) - [ ] [1-js/08-prototypes/01-prototype-inheritance/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/01-prototype-inheritance/article.md) - [ ] [1-js/08-prototypes/03-native-prototypes/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/03-native-prototypes/article.md) - [ ] [1-js/08-prototypes/04-prototype-methods/2-dictionary-tostring/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/04-prototype-methods/2-dictionary-tostring/solution.md) - [ ] [1-js/08-prototypes/04-prototype-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/08-prototypes/04-prototype-methods/article.md) - [ ] [1-js/09-classes/02-class-inheritance/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/09-classes/02-class-inheritance/article.md) - [ ] [1-js/09-classes/03-static-properties-methods/3-class-extend-object/solution.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/09-classes/03-static-properties-methods/3-class-extend-object/solution.md) - [ ] [1-js/09-classes/03-static-properties-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/09-classes/03-static-properties-methods/article.md) - [ ] [1-js/09-classes/07-mixins/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/09-classes/07-mixins/article.md) - [ ] [1-js/10-error-handling/1-try-catch/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/10-error-handling/1-try-catch/article.md) - [ ] [1-js/11-async/01-callbacks/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/01-callbacks/article.md) - [ ] [1-js/11-async/02-promise-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/02-promise-basics/article.md) - [ ] [1-js/11-async/03-promise-chaining/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/03-promise-chaining/article.md) - [ ] [1-js/11-async/04-promise-error-handling/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/04-promise-error-handling/article.md) - [ ] [1-js/11-async/05-promise-api/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/05-promise-api/article.md) - [ ] [1-js/11-async/06-promisify/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/06-promisify/article.md) - [ ] [1-js/11-async/08-async-await/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/11-async/08-async-await/article.md) - [ ] [1-js/13-modules/01-modules-intro/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/13-modules/01-modules-intro/article.md) - [ ] [1-js/13-modules/02-import-export/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/13-modules/02-import-export/article.md) - [ ] [1-js/99-js-misc/04-reference-type/article.md](/javascript-tutorial/en.javascript.info/commits/master/1-js/99-js-misc/04-reference-type/article.md) - [ ] [2-ui/1-document/01-browser-environment/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/01-browser-environment/article.md) - [ ] [2-ui/1-document/02-dom-nodes/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/02-dom-nodes/article.md) - [ ] [2-ui/1-document/04-searching-elements-dom/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/04-searching-elements-dom/article.md) - [ ] [2-ui/1-document/05-basic-dom-node-properties/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/05-basic-dom-node-properties/article.md) - [ ] [2-ui/1-document/06-dom-attributes-and-properties/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/06-dom-attributes-and-properties/article.md) - [ ] [2-ui/1-document/07-modifying-document/5-why-aaa/task.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/07-modifying-document/5-why-aaa/task.md) - [ ] [2-ui/1-document/08-styles-and-classes/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/08-styles-and-classes/article.md) - [ ] [2-ui/1-document/09-size-and-scroll/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/09-size-and-scroll/article.md) - [ ] [2-ui/1-document/11-coordinates/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/1-document/11-coordinates/article.md) - [ ] [2-ui/2-events/01-introduction-browser-events/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/01-introduction-browser-events/article.md) - [ ] [2-ui/2-events/02-bubbling-and-capturing/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/02-bubbling-and-capturing/article.md) - [ ] [2-ui/2-events/03-event-delegation/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/03-event-delegation/article.md) - [ ] [2-ui/2-events/04-default-browser-action/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/04-default-browser-action/article.md) - [ ] [2-ui/2-events/05-dispatch-events/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/2-events/05-dispatch-events/article.md) - [ ] [2-ui/3-event-details/1-mouse-events-basics/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/1-mouse-events-basics/article.md) - [ ] [2-ui/3-event-details/4-mouse-drag-and-drop/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/4-mouse-drag-and-drop/article.md) - [ ] [2-ui/3-event-details/6-pointer-events/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/6-pointer-events/article.md) - [ ] [2-ui/3-event-details/7-keyboard-events/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/3-event-details/7-keyboard-events/article.md) - [ ] [2-ui/4-forms-controls/1-form-elements/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/4-forms-controls/1-form-elements/article.md) - [ ] [2-ui/4-forms-controls/2-focus-blur/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/4-forms-controls/2-focus-blur/article.md) - [ ] [2-ui/4-forms-controls/3-events-change-input/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/4-forms-controls/3-events-change-input/article.md) - [ ] [2-ui/5-loading/01-onload-ondomcontentloaded/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/5-loading/01-onload-ondomcontentloaded/article.md) - [ ] [2-ui/99-ui-misc/02-selection-range/article.md](/javascript-tutorial/en.javascript.info/commits/master/2-ui/99-ui-misc/02-selection-range/article.md) - [ ] [3-frames-and-windows/01-popup-windows/article.md](/javascript-tutorial/en.javascript.info/commits/master/3-frames-and-windows/01-popup-windows/article.md) - [ ] [3-frames-and-windows/03-cross-window-communication/article.md](/javascript-tutorial/en.javascript.info/commits/master/3-frames-and-windows/03-cross-window-communication/article.md) - [ ] [3-frames-and-windows/06-clickjacking/article.md](/javascript-tutorial/en.javascript.info/commits/master/3-frames-and-windows/06-clickjacking/article.md) - [ ] [4-binary/01-arraybuffer-binary-arrays/article.md](/javascript-tutorial/en.javascript.info/commits/master/4-binary/01-arraybuffer-binary-arrays/article.md) - [ ] [4-binary/03-blob/article.md](/javascript-tutorial/en.javascript.info/commits/master/4-binary/03-blob/article.md) - [ ] [5-network/01-fetch/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/01-fetch/article.md) - [ ] [5-network/04-fetch-abort/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/04-fetch-abort/article.md) - [ ] [5-network/05-fetch-crossorigin/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/05-fetch-crossorigin/article.md) - [ ] [5-network/06-fetch-api/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/06-fetch-api/article.md) - [ ] [5-network/08-xmlhttprequest/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/08-xmlhttprequest/article.md) - [ ] [5-network/10-long-polling/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/10-long-polling/article.md) - [ ] [5-network/11-websocket/article.md](/javascript-tutorial/en.javascript.info/commits/master/5-network/11-websocket/article.md) - [ ] [6-data-storage/01-cookie/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/01-cookie/article.md) - [ ] [6-data-storage/02-localstorage/article.md](/javascript-tutorial/en.javascript.info/commits/master/6-data-storage/02-localstorage/article.md) - [ ] [7-animation/1-bezier-curve/article.md](/javascript-tutorial/en.javascript.info/commits/master/7-animation/1-bezier-curve/article.md) - [ ] [7-animation/2-css-animations/article.md](/javascript-tutorial/en.javascript.info/commits/master/7-animation/2-css-animations/article.md) - [ ] [7-animation/3-js-animation/article.md](/javascript-tutorial/en.javascript.info/commits/master/7-animation/3-js-animation/article.md) - [ ] [8-web-components/4-template-element/article.md](/javascript-tutorial/en.javascript.info/commits/master/8-web-components/4-template-element/article.md) - [ ] [8-web-components/5-slots-composition/article.md](/javascript-tutorial/en.javascript.info/commits/master/8-web-components/5-slots-composition/article.md) - [ ] [9-regular-expressions/03-regexp-unicode/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/03-regexp-unicode/article.md) - [ ] [9-regular-expressions/04-regexp-anchors/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/04-regexp-anchors/article.md) - [ ] [9-regular-expressions/08-regexp-character-sets-and-ranges/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/08-regexp-character-sets-and-ranges/article.md) - [ ] [9-regular-expressions/10-regexp-greedy-and-lazy/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/10-regexp-greedy-and-lazy/article.md) - [ ] [9-regular-expressions/11-regexp-groups/04-parse-expression/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/11-regexp-groups/04-parse-expression/solution.md) - [ ] [9-regular-expressions/13-regexp-alternation/03-match-quoted-string/task.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/13-regexp-alternation/03-match-quoted-string/task.md) - [ ] [9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/solution.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/solution.md) - [ ] [9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/task.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/2-insert-after-head/task.md) - [ ] [9-regular-expressions/14-regexp-lookahead-lookbehind/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/14-regexp-lookahead-lookbehind/article.md) - [ ] [9-regular-expressions/17-regexp-methods/article.md](/javascript-tutorial/en.javascript.info/commits/master/9-regular-expressions/17-regexp-methods/article.md) - [ ] [README.md](/javascript-tutorial/en.javascript.info/commits/master/README.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 <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 and git push origin master

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

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

javascript-tutorial / it.javascript.info

Sync with upstream @ 285083fc #441