I was facing this issue while pulling the code from the git central server.
Basically error says, 2 things.
(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.
I have verified (1), could not find any other terminal which was accessing this file.
I am not sure about (2), so I went ahead and deleted directly '.git/.MERGE_MSG.swp' file.
Yes, Now it worked without any issues!!!
Basically error says, 2 things.
(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.
I have verified (1), could not find any other terminal which was accessing this file.
I am not sure about (2), so I went ahead and deleted directly '.git/.MERGE_MSG.swp' file.
Yes, Now it worked without any issues!!!
No comments:
Post a Comment