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

Re: Cherry picking instead of merges.

From
Samuel Tardieu <sam@rfc1149.net>
Date
Jul 3, 2008, 21:18 UTC
Message-ID
<2008-07-03-23-18-40+trackit+sam@rfc1149.net>
In-Reply-To
<20080703205329.GA17923@old.davidb.org>
>>>>> "David" == David Brown <git@davidb.org> writes:

David> It's only sitting in a private developer's branch. I want to David> do the merge properly, but I'm just trying to figure out how to David> get the conflict resolution out of his work.

Why don't you create a commit which has both your (A) and company B branch head (B) as parent with the same content as the private developer's branch (P) which contains the succesful merge?

Something like that: (totally untested)

% git checkout A % git merge --no-commit -s ours B % git checkout P . % git commit -a

Previous: David BrownNext: Linus Torvalds
Message 5 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.