The typical behavior of
One possible reason is the eol (end of line) characters, which might be different between the two branches.
Quit first tour current rebase (since Git 2.12:
git rebase --quit)
Try again your rebase with the option (merge strategy)
-X ignore-space-at-eol, to see if the issue persists.
git pull works just fine
That is the difference between pull (fetch + merge) and rebase (replay commits)
x--x--x--x--X (master) \ --o--o--O (origin/master)
A pull will merge two HEAD commits
O who might differ only in one file.
x--x--x--x--X-----M (master after git pull) \ / --o--o--O (origin/master)
A rebase (or git pull --rebase) would replay master on top of origin/master, and previous '
x' commits might introduce a lot of conflict, even if
X (HEAD) only differ from one file from origin/master HEAD
x--x--x \ --o--o--O--x'--X' (master) (origin/master)