I use Meld in case there are conflicts of these types. The CLI can be configured for that, and mine is set up that way. But truly, I never just use plain pull,

I use Meld in case there are conflicts of these types. The CLI can be configured for that, and mine is set up that way. But truly, I never just use plain pull, but pull --rebase, and I have not experienced such a conflict in years. The commit history also stays a bit more linear. (Other developers use normal pull).