Your branch and 'origin/master' have diverged, and have 1 and 1 different commits each, respectively
报错信息:Yourbranchand'origin/master'havediverged,andhave1and1differentcommitseach,respectively. (use"gitpull"tomergetheremotebranchintoyours)解决方法:1、gitrebaseorigin/master2、gitpull--rebase3、gitpushoriginm