Currently working on a project with another person at work. Git has been super important for this. We just work from branches and then merge back into master. Then we can see if there are any conflicts from working on the same file.
We had to turn off line commenting in our COMPASS generated style.css, though, as it caused merge conflicts every time.