E325：注意找到一个名为“. git/. COMMIT_EDITMSG.swp”的交换文件

t3irkdon 于 11个月前发布在 Git

关注(0)|答案(5)|浏览(152)

我已经和一个团队一起工作了将近一年了。使用github/git来拉和推更改总是很容易的：

git pull
git add .
git commit -a -m "my work desc"
git push

字符串
直到最近，这一直很有效。现在无论如何，如果有人推了，每当我试图拉我得到这个消息：

E325: ATTENTION
Found a swap file by the name ".git/.COMMIT_EDITMSG.swp"
          owned by: X   dated: Wed Jan 23 16:01:06 2013
         file name: ~X/Sites/mysite/.git/COMMIT_EDITMSG
          modified: no
         user name: X   host name: X-2.local
        process ID: 77109
While opening file ".git/COMMIT_EDITMSG"
             dated: Thu Jan 24 16:22:48 2013
      NEWER than swap file!

(1) Another program may be editing the same file.
    If this is the case, be careful not to end up with two
    different instances of the same file when making changes.
    Quit, or continue with caution.

(2) An edit session for this file crashed.
    If this is the case, use ":recover" or "vim -r .git/COMMIT_EDITMSG"
    to recover the changes (see ":help recovery").
    If you did this already, delete the swap file ".git/.COMMIT_EDITMSG.swp"
    to avoid this message.

Swap file ".git/.COMMIT_EDITMSG.swp" already exists!
[O]pen Read-Only, (E)dit anyway, (R)ecover, (D)elete it, (Q)uit, (A)bort:

型
每次w/o失败时都会发生这种情况。我最终可以通过插入消息，保存和重新提交来解决这个问题，但这是一个痛苦的过程。你知道为什么会发生这种情况吗？
谢谢

Git

来源：https://stackoverflow.com/questions/14513349/e325-attention-found-a-swap-file-by-the-name-git-commit-editmsg-swp