Using git to collaborate with people without version control

Question

I use git to write scientific articles. I often have to collaborate with people who have never used VCS, and they are unlikely to ever be. Thus, the normal workflow is to make changes to the text file and send it to other users by e-mail, which can view the changes and make their own. What is the best method for me to keep track of all the changes made by me and others using git?

Answer 1

I assume that you can run the difference between their version and the updated version. If they don't like version control, I doubt they will like to read diff output.

Perhaps the best approach would be to create a shared Dropbox for collaboration. Dropbox uses version control behind the scenes (I think SVN), so any conflicts can be managed and errors can be eliminated, but they are completely seamless, so your colleagues who don't like version control can just open, edit and save files in the Dropbox Folder without worrying about commits or merges.

It also solves the problem of distribution. Dropbox sync is much safer than email in terms of missed updates or air crashes.

You can also store files in the git repository in Dropbox, which again will be invisible to people who do not use git, but this will allow you to periodically transfer your changes, providing a more reliable change history, and because you are all working on what is actually with the same working copy, you won’t have much painful merging.

Answer 2

• Commit current state.
• Let's open a new branch with master .
• Fill in the mailbox and send your files (except .git and .gitignore ).
• Return to master .

When you receive the modified files:

• Checkout branch # 2
• Delete all files (except .git and .gitignore ).
• Copy new ones.
• Commit.

Then use the branch as if you received the regular git patch.