记一次 Git HEAD 分支游离，切回master导致代码丢失的处理

写了一天的代码就这样丢了，也太可惜了点

所以网上各种找同类问题

最终整理出如下解决方案

 

1、 git reflog可以看到如下提交记录

 

origin master: Fast-forward

d3a5dbd HEAD@{8}: checkout: moving from 1de0bd9b48cd16695a0b0314b6392a8b6bf7e2e0 to master

1de0bd9 HEAD@{9}: commit (merge): Merge branch 'master' of 120.77.232.136:hopewanshuncar/react-native-base-component into HEAD

96b313a HEAD@{10}: commit: 优化滑动按钮

a626474 HEAD@{11}: commit: 优化基础组件

9815702 HEAD@{12}: commit: 基础库优化

d01c61c HEAD@{13}: commit: 基础组件性能优化

78e29fd HEAD@{14}: checkout: moving from master to 78e29fdc63711fec55674a397e89cd2cb9fc798d

d3a5dbd HEAD@{15}: clone: from http://120.77.232.136:3000/hopewanshuncar/react-native-base-component

 

找到一个相对较新的未合并的分支

 

2、git checkout 96b313a

 

3、git checkout -b diff

 

4、git checkout master

 

5、git  merge diff

之后可以利用工具手动合并代码冲突