git merge sprintbranch 报错问题 E325: ATTENTION

142 阅读1分钟

报错问题 E325: ATTENTION

    -   :15E325: ATTENTION  
        Found a swap file by the name "~/Desktop/human/.git/.MERGE_MSG.swp"  
        owned by: m dated: 一 12 25 11:08:44 2023  
        file name: ~m/Desktop/human/.git/MERGE_MSG  
        modified: no  
        user name: m host name: mdeMacBook-Pro.local  
        process ID: 5834 (STILL RUNNING)  
        While opening file "/Users/m/Desktop/human/.git/MERGE_MSG"  
        dated: 五 12 29 09:59:12 2023  
        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 /Users/m/Desktop/human/.git/MERGE_MSG  
        "  
        to recover the changes (see ":help recovery").  
        If you did this already, delete the swap file "/Users/m/Desktop/human/.git/.MERGE_MS  
        G.swp"  
        to avoid this message.  
          
        Swap file "~/Desktop/human/.git/.MERGE_MSG.swp" already exists!  
        [O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:

~根目录下执行此命令可以解决

  • rm -rf .MERGE_MSG.swp