修改命令错误
添加忽略
Merge branch 'master' of github.com:overtrue/latest-laravel
Merge branch 'master' of github.com:overtrue/latest-laravel
gjus