-
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
勘误改错字 from animalize #10
Merged
Merged
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
暇 会不会是通假字或者繁体字? |
ghost
mentioned this pull request
Jul 17, 2017
Open
查了一下,应该不是通假字和繁体字。 我创建了一个issue。其实不必立刻处理,权当一种记录吧。 |
Hi @animalize 感谢提供纠正, 这些争议字的根据是什么? 如果有根据出处供参考就好了 😄 |
我是这个流程:
您不用管这个pull request,放着就行啦。 |
ghost
changed the title
错字:暇 改为 瑕
勘误改错字 from animalize
Jul 21, 2017
暂时不收录个人意见
merge from source
准备把这个合上去, 本身也是前前朝的著作。 汉字也已经重新修订了, 也是该修下数据了, 后续有争议的话还可以再讨论。 https://github.com/chinese-poetry/chinese-poetry/pull/10/conflicts 我尝试解决这些冲突, 但非常吃力, 所以麻烦你解决下冲突。 再次感谢兄弟的贡献。 |
@jackeyGao |
请暂时revert这个合并,感觉部分冲突处理有误。 |
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.