git/list[1] front-page[2] threads[3] people[4] search[5] about
 

A problem when I use git merge

From
宋宋珂菲 <skf710559582@gmail.com>
Date
May 9, 2024, 09:58 UTC
Message-ID
<CAOd6J=s7XTsL_Le5_7zSePmR2gx0Fkxek+Ko+5wAJaEbXNqXEQ@mail.gmail.com>
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.
Message 1 of 1 in “A problem when I use git merge”
  1. 宋珂菲May 9, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.