Divversion

Divversion makes it easy to work together on code, with automatic file merges, powerful conflict resolution, and seamless file versioning. Based on Git and plays nice with GitHub, Bitbucket, GitLab!