When Git runs a merge, it names the files .merge_file_blabla, and Spoon does not recognize these as proper Java files. A quick-fix would be to e.g. .merge_file_blabla to .merge_file_blabla.java, but that will cause a platform dependence. Not sure what the best solution is here.
When Git runs a merge, it names the files
.merge_file_blabla, andSpoondoes not recognize these as proper Java files. A quick-fix would be to e.g..merge_file_blablato.merge_file_blabla.java, but that will cause a platform dependence. Not sure what the best solution is here.