Finish chapter 6 #10
Closed
Finish chapter 6 #10
Conversation
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
Contributor
|
不能自动merge，你能不能拉取最新的以后，修改冲突部分再提交？谢谢~ |
Contributor
Author
|
现在才看到。。嗯，什么意思，没懂。 |
Contributor
|
就是你修改的地方同时也被其他人修改了，导致不能够自动合并。。。。所以需要你手动的去更改，嗯。。。 |
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.
某些文章内部的链接需要修改，本文中只列举了。具体细节在QQ群截图告诉你们。