task3: JeremyZ #919
Closed
task3: JeremyZ #919
Conversation
This file contains 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
linghuccc
requested changes
Jul 1, 2024
这边没有修改其他task的文件，因为之前修改了文件夹名称，为了防止冲突，我rebase了task1的分支，导致看到的commit是这样的，task1修改可以参照下面： |
linghuccc
requested changes
Jul 4, 2024
我为了task1和task3并行，所以在task1修改文件夹名称后，task3 rebase了task1的分支，这样子我task3的修改也是在新文件夹名上修改的，merge之后才不会导致文件夹名称的冲突，如果真的需要，我就直接从task1新建分支我重新开一个merge吧 |
|
没新开PR的原因是因为我怕PR开启时间不对影响最后的任务奖励判断 |
linghuccc
requested changes
Jul 4, 2024
新开了PR：#1078 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Task3
由于Task1 PR修改了文件夹名，因此需要先对task1 PR进行合并！！！
Task1: #517