10

我尝试过了pull origin branschName

并得到了这个奇怪的错误：

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:

如何解决这个问题？

4

1 回答 1

12

似乎由创建的交换文件vi以某种方式未被删除。

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

于 2013-08-20T09:03:57.833 回答