1
2
3
4
5
6
7
8
9
| remote: Counting objects: 20, done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 20 (delta 16), reused 0 (delta 0)
Unpacking objects: 100% (20/20), done.
From 192.168.1.111:shipeng/weikang_mp_weixin
591280f..5736752 master -> origin/master
Auto-merging pages/index/index.js
CONFLICT (content): Merge conflict in pages/index/index.js
Automatic merge failed; fix conflicts and then commit the result.
|