Translate activity pr2#1915
Open
OpenLucasKaka wants to merge 4 commits intoreactjs:mainfrom
Open
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Collaborator
|
还是有冲突，你是从最新的代码上创建的分支吗？好像和之前 pr 的 commit 记录一样 从最新的 main 分支新建一个分支，然后再修改文件。 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
因在原来的PR中提交一直有冲突,现重新提一个PR,已解决review后的问题