shiyunxinaini的博客

git：出现Your branch and 'origin/zq-dev' have diverged,and have 1 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours)（说origin/zq-dev出现分叉）怎么办？1.为防止zq-de...