{"thread":{"id":"1638","subject":"RE: baffled again","startedAt":"2005-08-24T20:10:33Z","lastAt":"2005-08-24T20:10:33Z","messageCount":1,"participants":["Luck, Tony"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7723","messageId":"B8E391BBE9FE384DAA4C5C003888BE6F04385192@scsmsx401.amr.corp.intel.com","threadId":"1638","inReplyTo":null,"subject":"RE: baffled again","fromName":"Luck, Tony","fromEmail":"tony.luck@intel.com","sentAt":"2005-08-24T20:10:33Z","receivedAt":"2005-08-24T20:10:33Z","isPatch":false,"sender":{"key":"tony.luck@intel.com","avatar":"https://avatars.githubusercontent.com/u/5446021?v=4"},"body":">I think git did the \"right thing\", it just happened to be the thing that\n>Tony didn't want. Which makes it the \"wrong thing\", of course, but from a\n>purely technical standpoint, I don't think there's anything really wrong\n>with the merge. \n\nOn the plus side ... at least it wasn't a dumb user error this time [unless\nyou count merging the incorrect patch in the first place, and then having\nto revert it :-) ].\n\nCould GIT be smarter here?  Perhaps it could pick a few likely\nancestors and run the merge with each ... and then give some\nwarnings if there are files that come out differently?\n\n-Tony\n"}]}