Found a swap file by the name “.git/.MERGE_MSG.swp”

I tried to pull origin branschName

and got this strange error:

  • setting the work-tree of each bare repo
  • Executing git-hooks on windows errors out
  • Remove old remote branches from Git
  • git trouble via https: routines:SSL23_GET_SERVER_HELLO
  • How to get the Git Commit message in Git Tower?
  • Problems using maven with git
  • error: There was a problem with the editor 'vi'.
    Not committing merge; use 'git commit' to complete the merge.
    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:

    how to fix this?

  • If you write a file to the index in a merge that was conflicted, how do you go back to the conflicted state?
  • Conflict on changes on git
  • How do I configure Eclipse to use an existing git repository with existing source code?
  • git equivalent to hg -R?
  • Delete remote branch displayed on local by 'git branch -a'
  • how to see the deleted files using Git Bash?
  • One Solution collect form web for “Found a swap file by the name “.git/.MERGE_MSG.swp””

    It seems that a swap file created by vi has been somehow left undeleted.

    Remove .git/.MERGE_MSG.swp and attempt the git merge again.

    Git Baby is a git and github fan, let's start git clone.