Sync with reactjs.org @ 5fdb6a2e

[reactjs-translation-bot]

This PR was automatically generated.

Merge changes from reactjs.org at 5fdb6a2

The following files have conflicts and may need new translations:

• README.md

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

[sorousht]

The conflict has been resolved in a new PR #15

[sJJdGG]

@sorousht I don't think it's the correct way to resolve upstream merge conflicts.
All merge requests opened by translation bot has to be merged eventually instead of closing and opening a new pr (#15 in this matter) to do the same thing
You should push your commits to the same branch which has a PR opened by the bot. e.g. reactjs/es.react.dev#157
It's necessary because of keeping the commit history I think.
Also as indicated by the bot squashing is prohibited for the same reason.
Reopening for keeping the conversation going on this matter.
@tesseralis What do you think?

[tesseralis]

@sJJdGG is right. You should just merge the conflicts and push in this branch instead of opening up a new PR. I can edit the issue description to make this more clear.

[tesseralis]

Actually... as long as “master” from reactjs.org gets merged it doesn’t matter if you use this sync branch or make your own. I’d prefer editing this branch directly but it’s up to you!

[sorousht]

@sJJdGG @tesseralis I've just resolved the conflict and pushed to the sync branch. Is it ok?

[tesseralis]

Yup!