jaevest.blogg.se

It's a message from VIM which apparently you are using as the text editor in git.

The thing is when I do that, I can't seem to find my conflict that I should resolve. I tried pretty much everything I could think of. Hint: See the 'Note about fast-forwards' in 'git push -help' for details. You may want to first integrate the remote changes This is usually caused by another repository pushing Hint: Updates were rejected because the remote contains work that you do Swap file "~/Documents/Sites/recipegenerator/.git/.MERGE_MSG.swp" already exists! If you did this already, delete the swap file "/Users/username/Documents/Sites/recipegenerator/.git/.MERGE_MSG.swp" To recover the changes (see ":help recovery"). If this is the case, use ":recover" or "vim -r /Users/username/Documents/Sites/recipegenerator/.git/MERGE_MSG" (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. While opening file "/Users/larsvanurk/Documents/Sites/recipegenerator/.git/MERGE_MSG" User name: username host name: Users-MacBook-Pro.local Owned by: username dated: Wed Dec 14 12:28:45 2016įile name: ~username/Documents/Sites/recipegenerator/.git/MERGE_MSG Found a swap file by the name "~/Documents/Sites/recipegenerator/.git/.MERGE_MSG.swp"