If you are not sure of how to resolve the conflict, get in touch with the other person who modified the files, and find out why they made their changes. If you did not make changes, that need to be committed, to a file that got a conflict, just delete the file and run update again. Before committing, make sure the program can still be compiled. I've tried compiling under 2.5 using Makefile.elvis and Makefile-2.7 and I get the same error with hash. Templates can only declare classes or functions.
Templates can only declare classes or functions.
Templates can only declare classes or functions. Compilation aborted, too many Error messages.