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

Re: baffled again

From
Linus Torvalds <torvalds@osdl.org>
Date
Aug 24, 2005, 05:58 UTC
Message-ID
<Pine.LNX.4.58.0508232258170.3317@g5.osdl.org>
In-Reply-To
<12c511ca050823223333c41857@mail.gmail.com>
On Tue, 23 Aug 2005, Tony Luck wrote:
Show 5 quoted lines
> 
> So GIT decides that the test branch has had a patch, and the release
> branch hasn't ... and so it merges by keeping the version in test.
> 
> Plausible?
Very. Sounds like what happened.
		Linus
Previous: Tony LuckNext: Junio C Hamano
Message 3 of 10 in “baffled again”
  1. tony.luck@intel.comAug 23, 2005
  2. Tony LuckAug 24, 2005
  3. Linus TorvaldsAug 24, 2005
  4. Junio C HamanoAug 24, 2005
  5. Daniel BarkalowAug 24, 2005
  6. Linus TorvaldsAug 24, 2005
  7. Linus TorvaldsAug 24, 2005
  8. Junio C HamanoAug 25, 2005
  9. Tony LuckAug 25, 2005
  10. Daniel BarkalowAug 24, 2005

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.