git log --graph --decorate --oneline --all will show us the true state of the repository and help understand the situation. Would you post the relevant parts of that?
↧
Comment by Schwern on GitHub merge branch with 0 changes
↧