feat(ch5): translate 365-589 #57
Open
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
Signed-off-by: Coelacanthus <[email protected]>
ksyx
reviewed
Apr 2, 2022
Comment on lines
+9
to
+10
| 然后把问题留给你这个程序员来解决 | ||
| 好比如何合并相同文件或类似的东西（在不同分支）同时发生变化的问题 |
There was a problem hiding this comment.
Suggested change
| 然后把问题留给你这个程序员来解决 | |
| 好比如何合并相同文件或类似的东西（在不同分支）同时发生变化的问题 | |
| 然后把多个分支上相同文件的不同改变 | |
| 这个问题留给你这个程序员来解决 |
There was a problem hiding this comment.
我记得这只是最常见的，还有一些其他问题也会造成合并冲突
Co-authored-by: ksyx <[email protected]>
仔细想想确实是 Git Co-authored-by: ksyx <[email protected]>
kernelbin
approved these changes
Apr 21, 2023
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.
No description provided.