Your branch and remoteBranchName have diverged solution (zhuan)git pull时解决分支分叉（branch diverged）问题