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

Move the offending file to some other location. Then delete the offending file from your tree. Pull again. then diff the changes from your offending file over the file you just pulled. hack, but it works.