Git pull upstream night-version // works fine.įind the session and finish it (preferable). Git pull upstream night-version //while I'm in `master` cloned branch Git checkout upstream/master -b testmaster Git checkout upstream/night-version -b testnightversion Pen Read-Only, (E)dit anyway, (R)ecover, (D)elete it, (Q)uit, (A)bort: Swap file ".git/.MERGE_MSG.swp" already exists! If you did this already, delete the swap file ".git/.MERGE_MSG.swp" To recover the changes (see ":help recovery"). If this is the case, use ":recover" or "vim -r. (2) An edit session for this file crashed. If this is the case, be careful not to end up with twoĭifferent instances of the same file when making changes. (1) Another program may be editing the same file. Owned by: xxxxxx dated: Mon Nov 12 23:17:40 2012įile name: ~xxxxxx/Desktop/My-ios-App/.git/MERGE_MSG 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 git merge feature/remote_branchįound a swap file by the name ".git/.MERGE_MSG.swp" Clarification from comments: The session is the editing session. swp file (if you're sure the other git session has gone away). Previous Post Next Post Found a swap file by the nameįind the session and finish it (preferable).
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |