按名称找到交换文件 [英] Found a swap file by the name

问题描述

  git merge feature / remote_branch 
 
当我尝试合并分支和远程分支时， code> 

我收到了以下消息：



  E325：注意
通过名称.git / .MERGE_MSG.swp找到交换文件
拥有者：xxxxxx日期：Mon Nov 12 23:17:40 2012 
文件名：〜xxxxxx / Desktop / My-ios-App / .git / MERGE_MSG 
修改：YES 
用户名：xxxxxx主机名：unknown -b8-8d-12-22-27-72.lan 
进程ID：1639 
打开文件.git / MERGE_MSG
日期：2012年11月13日14:06:48 2012 
比交换文件更新！ 
 
（1）另一个程序可能正在编辑同一个文件。 
如果是这种情况，请注意不要在进行更改时最终得到同一文件的两个
不同实例。 
退出，或继续谨慎操作。 
 
（2）此文件的编辑会话崩溃。 
如果是这种情况，请使用：recover或vim -r .git / MERGE_MSG
来恢复更改（请参阅：帮助恢复）。 
如果您已经这样做了，请删除交换文件.git / .MERGE_MSG.swp
以避免此消息。 
 
交换文件.git / .MERGE_MSG.swp已经存在！ 
 [O] pen只读，（E）Dit无论如何，（R）ecover，（D）elete它，（Q）Uit，（A）bort：
  
 
如何处理这个问题？
解决方案
就像你有一个开放的 git commit 或 git merge ，编辑器仍然在编辑提交信息。  
 
 
有两种选择：
 
 
 
 
查找会话并完成它（最好）。 
 
 
删除 .swp 文件（如果您确定另一个git会话已经消失）。 $ b 
 
When I try to merge my branch with a remote branch:
git merge feature/remote_branch
I got this message:
E325: ATTENTION
Found a swap file by the name ".git/.MERGE_MSG.swp"
          owned by: xxxxxx   dated: Mon Nov 12 23:17:40 2012
         file name: ~xxxxxx/Desktop/My-ios-App/.git/MERGE_MSG
          modified: YES
         user name: xxxxxx   host name: unknown-b8-8d-12-22-27-72.lan
        process ID: 1639
While opening file ".git/MERGE_MSG"
             dated: Tue Nov 13 14:06:48 2012
      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, (D)elete it, (Q)uit, (A)bort:
How to deal with this?
解决方案
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).


                        
这篇关于按名称找到交换文件的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！