Skip to content
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

希望能合并 #28

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

希望能合并 #28

wants to merge 13 commits into from

Conversation

Kuangcp
Copy link

@Kuangcp Kuangcp commented Jun 14, 2017

转移测试类,因为个人觉得 junit测试类就不该这样写,都应该是@test方法的
然后自己简化了运行方式,加上了自己的jar能够在终端中就可以验证登录
过段时间再来仔细拜读代码,学习

@yaphone
Copy link
Owner

yaphone commented Jun 14, 2017

收到,非常感谢,朋友!
但是你的这个版本落后master分支较多,所以有些冲突,我尝试合并一下,如果合并不了的话,能不能麻烦你基于最新的master分支进行PR呢,再次感谢!

@Kuangcp
Copy link
Author

Kuangcp commented Jun 14, 2017

恩,好的。我也去调整下

@yaphone
Copy link
Owner

yaphone commented Jun 14, 2017

非常感谢!!
我尝试merge的时候一直卡在Unpacking Objects,然后就提示unpack-objects failed,比较麻烦,那这个冲突我就不处理了。
目前master分支我就先不提交了,你基于这个分支调整吧,然后提交个新的PR。
再次感谢,itchat4j有你更精彩!

@Kuangcp
Copy link
Author

Kuangcp commented Jun 15, 2017

貌似合并不了

@yaphone
Copy link
Owner

yaphone commented Jun 15, 2017

确实合并不了了,朋友,不过再次感谢!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants