Fixed the formate issue of the Chinese translation#518
Merged
spier merged 13 commits intoInnerSourceCommons:book-zhfrom Jan 4, 2023
Merged
Fixed the formate issue of the Chinese translation#518spier merged 13 commits intoInnerSourceCommons:book-zhfrom
spier merged 13 commits intoInnerSourceCommons:book-zhfrom
Conversation
Collaborator
Author
|
The merge conflict was resolved. |
spier
approved these changes
Jan 4, 2023
Member
|
@WillemJiang I am confused now. Should I merge the branch as is, or should I cherry-pick the commit that you mentioned? |
Collaborator
Author
|
@spier As the conflict is resolved， you can just merge it directly. |
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.
You can cherry-pick the change of bdaa6b04630afbcf3e02778d90a60a7140cf561e