I\'ve been working with a team for almost a year now. It\'s always been easy to use github/git to pull and push changes using:
git pull
git add .
git commit
I had the same problem and for some reason using git rm
didn't work for me.
To solve the problem, I simply removed the file instead: $ rm .git/.COMMIT_EDITMSG.swp
and that fixed the problem.
Unless you need .git/.COMMIT_EDITMSG.swp for some other purpose, you can use:
git rm .git/.COMMIT_EDITMSG.swp
to remove the file from the repository.
You simply need to commit the changes if after a merge from another branch you this swap error message. I git added - green files not committed. I committed the files - then done.
I tried deleting the message but it fails and complained that I do not have such file. So, I added a commit Message -m
when doing git commit -m
and the warning doesn't show any more .