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

Re: Cherry picking instead of merges.

From
David Brown <git@davidb.org>
Date
Jul 3, 2008, 22:39 UTC
Message-ID
<20080703223949.GA23092@old.davidb.org>
In-Reply-To
<alpine.LFD.1.10.0807031403380.2815@woody.linux-foundation.org>
On Thu, Jul 03, 2008 at 02:18:53PM -0700, Linus Torvalds wrote:
>End result: you have a nice merge with nice history that actually 
>converges at a common point, but you effectively did the merge resolution 
>one commit at a time with cherry-picking (or "git rebase", which is 
>obviously just a convenient shorthand for cherry-picking everything).

I'm still not clear how the one-commit-at-a-time resolution gets recorded anywhere (except in the cherry-picking branch).

It seems to be that I would need to do multiple merges, one at each point where there is a conflict that I had to resolved. I would remember this as I did each cherry picked change, but after the fact, I would have to compare the cherry picked change with the one it came from, and figure out where conflicts had to be resolved.

Thanks, David

Previous: Linus TorvaldsNext: Björn Steinbrink
Message 7 of 13 in “Cherry picking instead of merges.”
  1. David BrownJul 3, 2008
  2. Alex RiesenJul 3, 2008
  3. Avery PennarunJul 3, 2008
  4. David BrownJul 3, 2008
  5. Samuel TardieuJul 3, 2008
  6. Linus TorvaldsJul 3, 2008
  7. David BrownJul 3, 2008
  8. Björn SteinbrinkJul 4, 2008
  9. David BrownJul 4, 2008
  10. Linus TorvaldsJul 4, 2008
  11. Johannes SixtJul 4, 2008
  12. Linus TorvaldsJul 4, 2008
  13. Linus TorvaldsJul 4, 2008

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.