----- Original Message ----- From: Jeffery Brewer To: email@example.com Sent: Tuesday, August 07, 2012 3:57 AM Subject: [git-users] Beginner stuck in a commit
I've slowly been trying to get git to work and just running into loads of problems. Using the windows bash I just tried to do a commit this evening and forgot to add a message (e.g. -m "my work for today") and sent the bash into some sort of odd editing mode that I can't seem to get out of. I finally just closed the bash and opened a new bash and tried to commit and got all kinds of error messages with a prompt to type (R) to recover. Typed R to recover and it took me right back into the strange editing mode that I can't seem to get out of now. I've backed up all the files in the directory (sensing an impending catastrophe) but not sure what else to do at this point to get git running again. Any help would be appreciated. Others have mentioned that you are in one of those unfathomable Unix terminal editors ;-) Assuming/If you are on Windows... I'd suggest that you set up your configuration to use Notepad++ (a lovely open source editor). There is a Stackoverflow page with details. Set up your .gitconfig (mine's in C:\Documents and Settings\Philip\.gitconfig) as [core] editor = 'C:\\Program Files\\Notepad++\\notepad++.exe' -multiInst -notabbar -nosession -noplugin More detail... If I open a new bash in the directory and run "git commit" I'm getting this error message: E325: ATTENTION Found a swap file by the name ".git\.COMMIT_EDITMSG.swp" dated: Mon Aug 06 19:45:14 2012 file name: C:/Users/me/Documents/NetBeansProjects/foldername/.git/COMMIT_EDITMSG modified: YES user name: me host name: my computer process ID: 10368 While opening file ".git\COMMIT_EDITMSG" dated: Mon Aug 06 19:55:29 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\COMMIT_EDITMSG" to recover the changes (see ":help recovery"). If you did this already, delete the swap file ".git\.COMMIT_EDITMSG.swp" to avoid this message. Swap file ".git\.COMMIT_EDITMSG.swp" already exists! -- More -- SPACE/d/j: screen/page/line down, b/u/k: up, q: quit -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/XE0-ivLyDtAJ. To post to this group, send email to firstname.lastname@example.org. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en. No virus found in this message. Checked by AVG - www.avg.com Version: 2012.0.2197 / Virus Database: 2437/5181 - Release Date: 08/06/12 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to email@example.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.