When running the merge command from my branch into another. The following alert occurred:
According to the image description itself. The alert is displayed because the .MERGE_MSG.swp file is also being edited by another person or some editing in the file has generated conflict with the file version 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 his job and what is it for?