git管理-CSDN博客

本文链接：https://blog.csdn.net/weixin_40531175/article/details/122770102

git版本回退

git log --oneline

0c77f19 (HEAD -> master) v3
b375eb8 v2
4a0b248 v1

回到V1
git checkout  4a0b248 --  .
git commit -m 'v4'

v1 -> v2 -> v3 -> v4

恢复误删分支

git log -g

commit c562e892a9227c48b54223fd8e7529d61d9c821c (HEAD -> master, V1)
Reflog: HEAD@{0} (lhc0229 <2634093568@qq.com>)
Reflog message: merge V1: Fast-forward
Author: lhc0229 <2634093568@qq.com>
Date:   Wed Feb 2 15:29:52 2022 +0800

    V1 test

commit 0c77f195ec2d4b49ad86db6ce079476842555f2c
Reflog: HEAD@{1} (lhc0229 <2634093568@qq.com>)
Reflog message: checkout: moving from V1 to master
Author: lhc0229 <2634093568@qq.com>
Date:   Wed Feb 2 15:27:18 2022 +0800

    v3

git branch new_branch_name(新分支名) c562e892a9227c48b54223fd8e7529d61d9c821c(提交id)

撤销add

主要是针对 git add .

针对单文件
git reset HEAD test.js
git checkout -- test.js

针对全部
git reset HEAD .
git checkout -- .

关于冲突

[外链图片转存失败,源站可能有防盗链机制,建议将图片保存下来直接上传(img-DLgUpLWa-1643789012927)(QQ%E5%9B%BE%E7%89%8720220202160213.png)]




## 关于冲突
![在这里插入图片描述](https://img-blog.csdnimg.cn/e98f0d675bf04468af72f278426f3941.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAc291bENvbGxlY3Rpb24=,size_20,color_FFFFFF,t_70,g_se,x_16#pic_center)