I have two branches locally, master and Berislav. The latter is currently active, and I have committed all the changes. When I try to checkout to <
master
Berislav
I had the same problem, and this solved my issues (on Linux):
git config --global core.autocrlf input