Git asks me to commit or stash changes on checkout master, even though all changes were committed?

Question

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 <

Answer 1

As simple as this:

git stash
git stash pop

The "errors" you see when running git stash aren't anything to be concerned about. It's just git recognizing that the file doesn't have any uncommitted changes.

Answer 2

I had a similar problem on a fresh clone. I just forced the checkout with the --force (-f) flag

git checkout --force some_branch 

Probably not the best way of resolving the issue on a repo that you are making changes to, but in my case I was sure I hadn't made any changes, and just wanted to switch branch.