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

merge result

From
LLLynn Lin <lynn.xin.lin@gmail.com>
Date
Sep 9, 2011, 10:54 UTC
Message-ID
<CAPgpnMRrSmVrXD__jxv3uNrek8up+scHp+_Kj8+=HX8tfweWzQ@mail.gmail.com>
Hi All,
   When I merge branch A back to master branch,if there are same
commit(developer do double commit) both in master and A branch, there
will be two same commit in master branch.For example
   1->2->3-4>5        Master
       |
       4->6->7          A

When I merge A branch into master,the two same 4 commit will present in master branch.

Is there any wrong with my operation?

Thanks for your help Lynn

Next: Andrew Ardill
Message 1 of 6 in “merge result”
  1. Lynn LinSep 9, 2011
  2. Andrew ArdillSep 9, 2011
  3. Lynn LinSep 10, 2011
  4. Matthieu MoySep 9, 2011
  5. Lynn LinSep 10, 2011
  6. Matthieu MoySep 10, 2011

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.