I'm trying to come up with a workflow for two (right now) people. One of whom will be doing theme work and another who will be writing content. We are not co-located are will not be anytime soon.

The writer is quite unfamiliar with source control, so that would best be a phase two kind of thing. I could put MAMP on her box and have her write there, if that is the approach, how best to integrate the two solutions?

I've read this question: https://wordpress.stackexchange.com/questions/1717/how-to-best-setup-for-development-for-a-two-person-bi-coastal-team but since it is two years old, I thought I would see if anything has changed.