Anyone else ever run into these?  I&#x27;ve noticed PHP&#x27;s git history is infested with them.  Hard to avoid without a pre-receive hook, since &quot;git pull&quot; without &quot;--rebase&quot; creates this type of merge out of the box.