Making version control work