Merging data volumes and derivative versions of the data volumes

Disclosed are systems, methods, and software for performing version control. In a particular embodiment, a non-transitory computer readable medium is provided having stored therein program instructions that, when executed by a computer system, direct the computer system to perform a method of version control. The method includes executing a plurality of virtual machines from a plurality of derivative versions of an ancestor data volume, wherein the ancestor data volume and the plurality of derivative versions each comprise a plurality of files. The method further includes tracking modifications to the plurality of files in each of the plurality of derivative versions and merging the plurality of derivative versions with the ancestor data volume based on the modifications.