You cannot perform a merge on a binary file, or a file that stores latest version only

This error has the following cause and solution: