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

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

b19e156 (origin/master, origin/HEAD, master) HEAD@{11}: checkout: moving from develop to master
576eb65 (origin/develop, develop) HEAD@{12}: checkout: moving from f42bcbdd31fafbfa0234432254d8916c1713497f to develop
f42bcbd (HEAD) HEAD@{13}: checkout: moving from master to f42bcbdd31fafbfa04bee62554d23246c1713497f
b19e156 (origin/master, origin/HEAD, master) HEAD@{14}: checkout: moving from 78232b4345a82c3e32434b8918eb9b1306bd10caff5e to master
7823b45 HEAD@{15}: commit: BMOS-5371 仓库商品退货列表
83bcafe HEAD@{16}: commit: BMOS-5371 仓库商品退货列表
008d41a HEAD@{17}: commit: BMOS-5371 仓库商品退货列表
a7c3c6c HEAD@{18}: commit: BMOS-5368 商品入库列表
73c3d89 HEAD@{19}: commit: BMOS-5367 出入库列表
5cd5399 HEAD@{20}: commit: BMOS-5365 商品页列表样式
5c27351 HEAD@{21}: commit: BMOS-5365 商品页列表样式

 

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

 

2、git checkout 7823b45

 

 

 

3、git checkout -b diff

4、git checkout master

5、git  merge diff

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