Found a swap file by the name

Looks like you have an open git commit or git merge going on, and an editor is still open editing the commit message.

Two choices:

  1. Find the session and finish it (preferable).
  2. Delete the .swp file (if you’re sure the other git session has gone away).

Clarification from comments:

  • The session is the editing session.
  • You can see what .swp is being used by entering the command :sw within the editing session, but generally it’s a hidden file in the same directory as the file you are using, with a .swp file suffix (i.e. ~/myfile.txt would be ~/.myfile.txt.swp).

Related Posts:

  1. What is the best (and safest) way to merge a Git branch into master?
  2. Undo a Git merge that hasn’t been pushed yet
  3. How can I switch to another branch in git?
  4. Git merge hotfix branch into feature branch
  5. Abort a Git Merge
  6. GitHub: Permission denied (publickey). fatal: Could not read from remote repository
  7. git – remote add origin vs remote set-url origin
  8. GitHub Error Message – Permission denied (publickey)
  9. Updating a local repository with changes from a GitHub repository
  10. Git push results in “Authentication Failed”
  11. github changes not staged for commit
  12. Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
  13. Git push results in “Authentication Failed”
  14. Download single files from GitHub
  15. How do I pull my project from github?
  16. How to resolve merge conflicts in a Git repository
  17. Difference between Git and GitHub
  18. How to solve SSL certificate: self signed certificate when cloning repo from github?
  19. How can I merge multiple commits onto another branch as a single squashed commit?
  20. How can I merge multiple commits onto another branch as a single squashed commit?
  21. How to find my GitHub username so that I can be found via the URL?
  22. Pushing to Git returning Error Code 403 fatal: HTTP request failed
  23. github website publish cannot publish unborn HEAD
  24. The following untracked working tree files would be overwritten by merge, but I don’t care
  25. The following untracked working tree files would be overwritten by merge, but I don’t care
  26. fatal: The current branch master has no upstream branch
  27. Create a tag in a GitHub repository
  28. Git: Could not resolve host github.com error while cloning remote repository in git
  29. How to pull a specific branch from Github
  30. GitHub: invalid username or password
  31. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  32. How do I update or sync a forked repository on GitHub?
  33. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  34. Can I share my private GitHub repository by link?
  35. There is no tracking information for the current branch
  36. Is there a “theirs” version of “git merge -s ours”?
  37. Git push results in “Authentication Failed”
  38. Meaning of the GitHub message: push declined due to email privacy restrictions
  39. How to rename a directory/folder on GitHub website?
  40. “*** Please tell me who you are.” when using SSH key
  41. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  42. Download a single folder or directory from a GitHub repo
  43. Pull request vs Merge request
  44. Clone A Private Repository (Github)
  45. How do I rename a repository on GitHub?
  46. The following untracked working tree files would be overwritten by merge, but I don’t care
  47. error: cannot lock ref.. ‘refs/tags’ exists; cannot create ‘refs/tags/
  48. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  49. Is there a “theirs” version of “git merge -s ours”?
  50. Git: Installing Git in PATH with GitHub client for Windows
  51. ! [rejected] master -> master (fetch first)
  52. How to git add a whole folder
  53. My new Github page isn’t showing up
  54. How can I remove a commit on GitHub?
  55. Unity Collaborate vs GitHub
  56. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  57. SourceTree keeps asking for Github password
  58. How do I set up Eclipse/EGit with GitHub?
  59. Repository size limits for GitHub.com
  60. How to change the license for a project at Github?
  61. Why I always Got Error “Push to origin/master was rejected”?
  62. Is it possible to pull just one file in Git?
  63. How to resolve git status “Unmerged paths:”?
  64. Git lfs – “this exceeds GitHub’s file size limit of 100.00 MB”
  65. Github Windows ‘Failed to sync this branch’
  66. fatal: could not read Username for ‘https://github.com’: No such file or directory
  67. Github Authentication Failed – … GitHub does not provide shell access
  68. How to update a branch with master on GitHub
  69. How do I pull files from remote without overwriting local files?
  70. Git keeps prompting me for a password
  71. git push origin master does not work
  72. How to keep a branch synchronized/updated with master?
  73. Resolve Git merge conflicts in favor of their changes during a pull
  74. Can I arrange repositories into folders on Github?
  75. Delete forked repo from GitHub
  76. How to discard local changes and pull latest from GitHub repository
  77. Could not create work tree dir ‘example.com’.: Permission denied
  78. Is there a git-merge –dry-run option?
  79. Git pull – Please move or remove them before you can merge
  80. Differences between Commit, Commit and Push, Commit and Sync
  81. How can I delete all Git branches which have been merged?
  82. key_load_public: invalid format
  83. How do I show the changes which have been staged?
  84. Git push hangs when pushing to Github?
  85. Git: Where exactly is the “working directory”?
  86. Create empty branch on GitHub
  87. Import existing source code to GitHub
  88. Git push requires username and password
  89. GIT and Development URL’s point to production
  90. Pull latest stable release via git [closed]
  91. Is it possible to checkout a beta version of WordPress via github?
  92. how can I create a WP offline environment before releasing the websites? [closed]
  93. How to use Git Revert
  94. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  95. How can I determine the URL that a local Git repository was originally cloned from?
  96. How to create a .gitignore file
  97. Why does Git say my master branch is “already up to date” even though it is not?
  98. Your repository has no remotes configured to push to
  99. Specify an SSH key for git push for a given domain
  100. How to use Git and Dropbox together?

Leave a Comment