How do I merge changes from a squashed commit in master without encountering spurious conflicts?

Question

This is really a git question; Azure DevOps is only relevant because it does the squashing for us, which is nice.

In Azure DevOps, my team and I ofte