[dynode]

I wrote my thesis with latex + git. Merging can sometimes be wonky, but no wonkier than usual.

I had my sister review my thesis for grammar and spelling, she doesn't do git, so I checked out a coy in a dropbox folder and shared it with her. She made her edits in the folder, and would send me emails as she finished each chapter. After she finished a chapter I would check in her changes and merge the diffs with FileMerge.

Worked pretty well, though we only collaborated on text, I never merged figures or equations. I also had a cron job that would render the head of the master and put it on my website so my advisor and committee members could check in on my progress.