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

I tried to pull origin branschName

and got this strange error:

  • How can I see how much I have remaining of a rebase?
  • Connecting to bitbucket repository from jenkins server
  • Creating SSH keys for Gerrit and Hudson
  • Renaming a branch while on pull request
  • Is it possible to create a remote repo on GitHub from the CLI without opening browser?
  • git status shows fatal: bad object HEAD
  • 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?

  • Is there an alternative to a “push” hook?
  • Version control system for game development with UDK?
  • What parameters are showing undefined in this dnvm.ps1 command? Deployment to Azure Web Site Fails as a result
  • Git strategy to backport bugfixes into older branches (cherry-pick vs. merge)
  • Is it possible to get commits history for one file in github api?
  • git repository structure with multiple modules
  • 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.