Hello，Dear Mr. or Ms.，
Sorry to bother you by email. I need your help!
when I use git merge to merge codes, I find codes lost. The situation is like this： A branch called master, another branch called dev, last branch called feature. On April 20th，person A pushed a commit m1 to feature. On April 26th, branch dev is create from branch master, On April 30th, another person B pushed a commit m2 to master, On May 5th, person A used cherry-pick to merge m1 from feature to dev, On May 7th，I merge master to dev， but I find conflict codes(between m1 and m2) is auto merged without info（like unmerged paths), m2'codes covered m1's. And I want know why m2 is covered without prompt？
I had do some try to make a reproduction, but failed. T T
Looking forward to your reply！
Thanks for your reply!
Best Regards.