今天获取git线上仓库代码报了这个错误:zhangzhi@moke:~/code/ktsg-api$ git pullYou have not concluded your merge (MERGE_HEAD exists).Pl...

今天获取git线上仓库代码报了这个错误:zhangzhi@moke:~/code/ktsg-api$gitpullYouhavenotconcludedyourmerge(MERGE_HEADexists).Please,commityourchangesbeforeyoucanmerge.　　 错误可能是因...

一、常用命令切换到master分支：gitcheckoutmaster查看已有本地及远程分支：gitbranch-a（先gitpull拉下全部数据）查看远程分支：gitbranch-r查看本地分支：gitbranch删除远程dev分支：gitpushorigin--deletedev删除本地dev分支：gitbranc...