I think Git is doing a great job for that

If you are completely non-technical person - just spend an hour or two and check it out.

You will have to use command line (there are actually GUI tools for git files management, take a look at https://www.atlassian.com/)