git dev强制合并到master

git checkout master 
切换到旧的分支

git reset --hard develop  
 将本地的旧分支 master 重置成 develop

git push origin master --force 
 再推送到远程仓库
 

如果出错：

Total 0 (delta 0), reused 0 (delta 0)
remote: GitLab: You are not allowed to force push code to a protected branch on this project.
To http://xxx/xxx.git
 ! [remote rejected]   master -> master (pre-receive hook declined)
error: failed to push some refs to 'http://xxx/xxx.git'

先把master取消protect.