强制拉取最新代码:
git fetch --all&&git reset --hard origin/master&&git pull
获取指定分支代码:
git clone -b dev_jk http://10.1.1.11/service/tmall-service.git
新建分支并切换过去:
git checkout -b xx
切换到分支:
git checkout xx
查看分支:
git branch
删除分支:
git branch -D xx (本地)
git push origin --delete for_brazil (远程)
==强制回滚:
git reflog查看commit id
git reset —hard commit_id 退回到目标提交
git push origin HEAD —force 强制插入到头部
Merge的常用方式:
1.新建分支,在分支上merge Account分支
2.出现冲突,解决冲突;
3.git add .;git commit
4.完成merge
mvn clean install