git问题:Your branch and 'origin/zq-dev' have diverged,and have 1 and 1 different commits each?如何解决
git:出现Yourbranchand'origin/zq-dev'havediverged,andhave1and1differentcommitseach,respectively.(use"gitpull"tomergetheremotebranchintoyours)(说origin/zq-dev出现分叉)怎么办?1.为防止zq-dev分支内容的丢失,先合并zq-dev到master:gi