Re: [Q] merge squash unexpected conflicts

Cory Sharp [off-list ref] writes:

Am I doing something a little wrong or unexpected?  Is there a way
around this squash conflict behavior?  This doesn't seem to happen
with plain merge without squash.

Of course.  That's the whole point of recording a merge as a merge.