Re: [Q] merge squash unexpected conflicts

Cory Sharp [off-list ref] writes:

quoted

If you want support for repeated merges by merge tracking, you do not want
todiscard the merge history by using --squash.

Why doesn't --squash do merge tracking?  The help didn't indicate that
it doesn't, and I don't understand why ...

Because "merge" is (no surprise) what tracks what (two or more) things
were merged.  And with --squash you are choosing not to make a merge.  I
am not sure if there is any more thing to be explained...