1. git merge错了分支,回退到merge前的状态
git reset --hard origin/develop
2. git 删除本地分支和远程分支
删除本地分支:$ git branch -d <BranchName> //error: The branch is not fully merged $ git branch -D <BranchName> 删除远程分支:$ git push origin --delete <BranchName>
git reset --hard origin/develop
删除本地分支:$ git branch -d <BranchName> //error: The branch is not fully merged $ git branch -D <BranchName> 删除远程分支:$ git push origin --delete <BranchName>