发现

Question

我试图pull origin branschName

，并得到这个奇怪的错误命名为“git的/ .MERGE_MSG.swp”交换文件：

error: There was a problem with the editor 'vi'. 
Not committing merge; use 'git commit' to complete the merge. 


E325: ATTENTION 
Found a swap file by the name ".git/.MERGE_MSG.swp" 
      owned by: eladb dated: Tue Aug 20 10:52:03 2013 
     file name: ~eladb/MyWorkspace/Client/.git/MERGE_MSG 
      modified: no 
     user name: eladb host name: Elads-MacBook-Pro-2.local 
     process ID: 29959 (still running) 
While opening file ".git/MERGE_MSG" 
      dated: Tue Aug 20 10:53:11 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/MERGE_MSG" 
    to recover the changes (see ":help recovery"). 
    If you did this already, delete the swap file ".git/.MERGE_MSG.swp" 
    to avoid this message. 

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

如何解决这一问题？

Answer 1

看来由vi创建的交换文件已被以某种方式留下未删除。

删除.git/.MERGE_MSG.swp并再次尝试git merge。