# RE: baffled again

1 messages from 2005-08-24 to 2005-08-24. Participants: Luck, Tony.
Thread: https://gitlist.dev/t/1638

## Luck, Tony, 2005-08-24 20:10

Subject: RE: baffled again
Message-ID: <B8E391BBE9FE384DAA4C5C003888BE6F04385192@scsmsx401.amr.corp.intel.com>
URL: https://gitlist.dev/e/B8E391BBE9FE384DAA4C5C003888BE6F04385192%40scsmsx401.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

```