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
git rebase
I exited from my text editor that was accessing the project directories, then tried merging to the master branch and it worked.