ParentFull threadtmhedberg·> Until Git can ignore trailing spaces as part of the merge strategyIt can: git merge -X ignore-space-at-eolView on HN