Looks like you have an open git commit
or git merge
going on, and an editor is still open editing the commit message.
Two choices:
- Find the session and finish it (preferable).
- Delete the
.swp
file (if you're sure the other git session has gone away).
Clarification from comments:
- The session is the editing session.
- You can see what
.swp
is being used by entering the command:sw
within the editing session, but generally it's a hidden file in the same directory as the file you are using, with a.swp
file suffix (i.e.~/myfile.txt
would be~/.myfile.txt.swp
).