I\'m using git, and made a small commit followed by a large one. I decided to use git rebase to squash the two commits together before pushing them. (I\'ve ne
I had a similar problem. But it was very simple to resolve.
On a Windows machine, my file explorer had a folder open that existed in one branch but not in the other I checked out.
Closing the File explorer resolved the problem.