合并代码的时候，git提示：

E325: ATTENTIONFound a swap file by the name "~/Documents/sqbj_work/client-android/.git/.MERGE_MSG.swp"          owned by: bjbl030   dated: Tue Feb 19 10:13:31 2019         file name: ~bjbl030/Documents/sqbj_work/client-android/.git/MERGE_MSG          modified: YES         user name: bjbl030   host name: 172-11-0-81.lightspeed.jcvlfl.sbcglobal        process ID: 2403While opening file "/Users/bjbl030/Documents/sqbj_work/client-android/.git/MERGE_MSG"             dated: Thu Feb 21 13:49:33 2019      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/bjbl030/Documents/sqbj_work/client-android/.git/MERGE_MSG"    to recover the changes (see ":help recovery").    If you did this already, delete the swap file "/Users/bjbl030/Documents/sqbj_work/client-android/.git/.MERGE_MSG.swp"-- More --复制代码

经过查资料，内容编辑的时候产生然后最后自动删除，编辑过程异常的时候该文件不会自动删除，该文件与git没有关系，可以手动删除

If you did this already, delete the swap file复制代码