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

Re: my git problem

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Apr 28, 2008, 22:14 UTC
Message-ID
<alpine.LFD.1.10.0804281512110.3119@woody.linux-foundation.org>
In-Reply-To
<alpine.LFD.1.10.0804281437160.3119@woody.linux-foundation.org>
On Mon, 28 Apr 2008, Linus Torvalds wrote:
Show 5 quoted lines
> 
> I don't actually see what was wrong with the old script.  The merge was
> really oddly done, but apart from that, something like this should work
> (just your old script with some trivial fixes to 'git merge' and using
> somewhat saner arguments):

Side note: you are still going to have *exactly* the same issue if you have other git trees (not origin) that contain the same patch.

The fact is, your model of "merging by applying patches" is the real problem here. It's not a model that can work unless all trees are independent and they obviously aren't. So trying to merge with "origin" is only going to remove _one_ tree from the equation.

			Linus
Previous: Johannes SchindelinNext: Andrew Morton
Message 20 of 21 in “my git problem”
  1. Andrew MortonApr 27, 2008
  2. Linus TorvaldsApr 27, 2008
  3. Andrew MortonApr 27, 2008
  4. Linus TorvaldsApr 27, 2008
  5. Andrew MortonApr 28, 2008
  6. Johannes SchindelinApr 28, 2008
  7. Andrew MortonApr 28, 2008
  8. Johannes SchindelinApr 28, 2008
  9. Linus TorvaldsApr 28, 2008
  10. J. Bruce FieldsApr 29, 2008
  11. Jakub NarebskiApr 30, 2008
  12. Andrew MortonApr 28, 2008
  13. Linus TorvaldsApr 28, 2008
  14. Andrew MortonApr 28, 2008
  15. Carl WorthMay 1, 2008
  16. Daniel BarkalowApr 28, 2008
  17. Andrew MortonApr 28, 2008
  18. Linus TorvaldsApr 28, 2008
  19. Johannes SchindelinApr 28, 2008
  20. Linus TorvaldsApr 28, 2008
  21. Andrew MortonApr 29, 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.