Merge branch 'master' of E:\MyShop1 with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
第一组金红玉
Merge remote-tracking branch 'origin/master'