I.e. a merge when I truly want to combine two histories (Geany master + the PR) and squash commit when I just applying relatively simple/small patches.
Basically agree, but just pointing out ahead of time its always going to be a judgement call when to do squash