See https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b

[ci skip]