git version: after v2.21.0 can reproduce this bug reproduce steps: git clone https://github.com/zhangchunlin/gitbug cd gitbug git cherry-pick dev Then there will be a conflict with the cherry-pick, but if you run "md5sum *", will get: 6f96c8bc9e3df2f6fef1ecbb09f218f6 ICS_usc_any_any_9.1.5_8871.uscc_261_130664_2048-release.apk 6f96c8bc9e3df2f6fef1ecbb09f218f6 ICS_usc_any_any_9.8.0_b2cbd84d94.b2cbd84_297_131010_2048-release.apk The second file get a wrong file content. 3 related files md5: 6f96c8bc9e3df2f6fef1ecbb09f218f6 ICS_usc_any_any_9.1.5_8871.uscc_261_130664_2048-release.apk d1bdd852b32c09ec93a5494afb3c67e7 ICS_usc_any_any_9.1.5_8871.uscc_266_130703_2048-release.apk b2c50a9d7d488aa0b62ec7e68706ea85 ICS_usc_any_any_9.8.0_b2cbd84d94.b2cbd84_297_131010_2048-release.apk I use git bisect to found the commit which cause this problem: https://github.com/git/git/commit/48c9cb9d6d058bcf18e931a1ed0d88792bb506c9
