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.

Sign up for GitHub

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

Jump to bottom

好多冲突代码 #1

Open

xadlovezy opened this issue May 8, 2018 · 5 comments

xadlovezy commented May 8, 2018

好多冲突代码，怎么都提交了

Owner

xiangzhihong commented May 17, 2018

你把代码下载后，重新构建一下

zhangxiann commented May 28, 2018

@xiangzhihong 向老师，你可以clone到本地构建看看，真的好多冲突，整个项目检索"<<<<<<< HEAD"，出现了51次

Owner

xiangzhihong commented May 28, 2018

好的，我回头更新下

zhangxiann commented May 28, 2018

好的，麻烦啦

Owner

xiangzhihong commented May 28, 2018

已经提交，去过再有问题，可以加我qq1044817967

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment