title: Found a swap file by the name
body: <p>When I try to merge my branch with a remote branch:</p>
  
  <pre><code>git merge feature/remote_branch
  </code></pre>
  
  <p>I got this message:</p>
  
  <pre><code>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:
  </code></pre>
  
  <p>How to deal with this?</p>