git 指令总结

git 指令总结

---

1.查看本地分支

git branch -a
  remotes/origin/HEAD -> origin/master
  remotes/origin/develop
  remotes/origin/dv2
  remotes/origin/master
  remotes/origin/test

2、git 拉取更新远程分支列表

git remote update origin --prune

3.复制分支

从master复制一个dev分支：

git  chekout mater
git checkout -b dev

4.合并分支

1.合并分支
把master合并到 dev

git  chekout dev
git merge master
git push

2.rebase合并
为了避免合并时解决冲突以rebase进行合并

git rebase --m release

5.删除分支

git branch -d add_user_setting  //删除本地分支add_user_setting
git push origin :hotfix_authority_backup  // 删除远程分支hotfix_authority_backup

6.空

7.拉代码冲突

 git pull -r 
   
First, rewinding head to replay your work on top of it...
Applying: cancel app_time comment
Using index info to reconstruct a base tree...
M       src/omc/ui/locale/index.js
M       src/omc/ui/views/Upgrades/upgradePackage/constants.js
M       src/omc/ui/views/Upgrades/upgradePackage/index.jsx
Falling back to patching base and 3-way merge...
Auto-merging src/omc/ui/views/Upgrades/upgradePackage/index.jsx
Auto-merging src/omc/ui/views/Upgrades/upgradePackage/constants.js
Auto-merging src/omc/ui/locale/index.js
CONFLICT (content): Merge conflict in src/omc/ui/locale/index.js
error: Failed to merge in the changes.
Patch failed at 0001 cancel app_time comment
Use 'git am --show-current-patch' to see the failed patch
 
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

解决方案：

1.修改冲突，
2.git add git rebase --continue

8.代码回滚

8.1本地代码回滚

git reset --hard {version}  

8.2远程代码回滚

因为本地代码回滚后版本比远程仓库版本低，需要强制push

git reset --hard {version}  
git push -f

---

作者：jiuweiC
来源：CSDN
原文：https://blog.csdn.net/jiuweiC/article/details/85601226
版权声明：本文为博主原创文章，转载请附上博文链接！