{"thread":{"id":"61440","subject":"A problem when I use git merge","startedAt":"2024-05-09T09:58:59Z","lastAt":"2024-05-09T09:58:59Z","messageCount":1,"participants":["宋珂菲"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"494345","messageId":"CAOd6J=s7XTsL_Le5_7zSePmR2gx0Fkxek+Ko+5wAJaEbXNqXEQ@mail.gmail.com","threadId":"61440","inReplyTo":null,"subject":"A problem when I use git merge","fromName":"宋珂菲","fromEmail":"skf710559582@gmail.com","sentAt":"2024-05-09T09:58:46Z","receivedAt":"2024-05-09T09:58:59Z","isPatch":false,"sender":{"key":"skf710559582@gmail.com","avatar":null},"body":"Hello，Dear Mr. or Ms.，\n\nSorry to bother you by email.  I need your help!\n\nwhen I use git merge to merge codes, I find codes lost.\nThe situation is like this： A branch called master, another branch\ncalled dev, last branch called feature.\nOn April 20th，person A pushed a commit m1 to feature.\nOn April 26th, branch dev is create from branch master,\nOn April 30th, another person B pushed a commit m2 to master,\nOn May 5th, person A used cherry-pick to merge m1 from feature to dev,\nOn May 7th，I merge master to dev， but I find conflict codes(between m1\nand m2) is auto merged without info（like unmerged paths), m2'codes\ncovered m1's.\nAnd I want know why m2 is covered without prompt？\n\n\nI had do some try to make a reproduction, but failed. T T\n\nLooking forward to your reply！\n\n\nThanks for your reply!\n\nBest Regards.\n"}]}