I have two branches: 1.0, and IE-Fixes. I have no uncommitted changes in IE-Fixes or 1.0. Whenever I try to merge IE-fixes into 1.0, I keep getting told that it is up to date, but I know by looking at them in a browser that the two branches are different.
How can I merge the branches when Git is saying they're the same and won't do so?