Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs(cn): translate reference/react-dom/server/renderToReadableStream into Chinese #1228

Merged
merged 14 commits into from
Jul 3, 2023

Conversation

zhenmang
Copy link
Contributor

@zhenmang zhenmang commented Jun 28, 2023

This is the new PR. Thank Yucohny for review on the previous #1214.

@github-actions
Copy link

github-actions bot commented Jun 28, 2023

Size changes

📦 Next.js Bundle Analysis for react-dev

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

Copy link
Collaborator

@Yucohny Yucohny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

自查相关格式。

@zhenmang
Copy link
Contributor Author

zhenmang commented Jun 28, 2023

I have never changed branch main. So, it is confuzed why there are conflicts with main.
I can not resolve these conflicts because i can not operate anything after i click the button named Resolve conflicts above, and also, there is no conflicts in my local code.

@CoderSerio
Copy link
Contributor

CoderSerio commented Jun 28, 2023

I have never changed branch main. So, it is confuzed why there are conflicts with main. I can not resolve these conflicts because i can not operate anything after i click the button named Resolve conflicts above, and also, there is no conflicts in my local code.

@zhenmang
if you less familiar with git operations, maybe you can have a try:

  1. save and backup your translation content.
  2. type in the followed command into your terminal, and the conflicts and your changes will disappear temporarily:
  • git add .
  • git stash (you can type in git stash pop to show them again if need)
  • git pull origin main
  1. copy the content backuped and paste it.
  2. add, commit and push again.

hope this works to you

zhenmang and others added 2 commits June 29, 2023 09:44
@zhenmang
Copy link
Contributor Author

zhenmang commented Jul 1, 2023

I have completed the modifications.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending Modify 已校对,待修改阶段
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants