I can’t guarantee that this will help, but you could try
git rebase -Xignore-space-change master
or
git rebase -Xignore-all-space master
.
-X
passes options into the merge algorithm, and the default merge algorithm has these options to affect how it handles whitespace.