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

RE: baffled again

From
Luck, Tony <tony.luck@intel.com>
Date
Aug 24, 2005, 20:10 UTC
Message-ID
<B8E391BBE9FE384DAA4C5C003888BE6F04385192@scsmsx401.amr.corp.intel.com>
>I think git did the "right thing", it just happened to be the thing that
>Tony didn't want. Which makes it the "wrong thing", of course, but from a
>purely technical standpoint, I don't think there's anything really wrong
>with the merge.

On the plus side ... at least it wasn't a dumb user error this time [unless you count merging the incorrect patch in the first place, and then having to revert it :-) ].

Could GIT be smarter here? Perhaps it could pick a few likely ancestors and run the merge with each ... and then give some warnings if there are files that come out differently?

-Tony
Message 1 of 1 in “RE: baffled again”
  1. Luck, TonyAug 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.