git rebase: “error: cannot stat 'file': Permission denied”

Question

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

Answer 1

If you have the Meld merge tool open, close that. It blocks the file overwriting.