Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: 宋珂菲 <>
Subject: A problem when I use git merge
Date: Thu, 9 May 2024 17:58:46 +0800	[thread overview]
Message-ID: <> (raw)

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.

                 reply	other threads:[~2024-05-09  9:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='' \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).