Open
Conversation
…Management System
Member
|
先解决好冲突 |
Contributor
Author
|
Contributor
Author
|
冲突解决了，然后怎么办 |
Member
冲突还没解决，解决后然后组织好代码就可以合并到主分支了 |
Contributor
Author
合并了，然后等你通过就行了吧 |
Member
是的 |
Contributor
Author
老师，主分支为什么还是没有我的文件 |
Member
这个pull request和主分支有冲突，合并不进去，需要先解决这个冲突才可以 |
Contributor
Author
老师，这个冲突要怎么解决 |
Contributor
Author
刚刚已经显示解决了但还是没解决 |
Contributor
Author
老师，冲突已经解决了，只要等你提交了吧 |
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.
提交