1
When executing the command of merge of my branch in another. The following warning has occurred:
As per the image description itself. The alert is displayed because the file .MERGE_MSG.swp
is also being edited by someone else or some file editing has caused conflict with the version of the file on my machine.
I will delete it from my machine to download the current version of master. But first I would like a definition about the file. What is its function and what is it for?