This error has the following cause and solution:
You cannot perform Merge Branches on these two files.