Every save forms a new version online, but you can go back and retroactively mark certain versions as major milestones. Milestones are roughly equivalent to commits in Git.
Since we're primarily focused on graphic design formats, we don't attempt to do any merging of files since it's unclear that the end product would make much sense. We don't lock files either. If two users simultaneously edit the same file, one of them "loses" and shows up as a Conflicted copy that you can visually resolve in the Comparison view online.