On second thought, gitignore all sample data. We can still alter it with git add -f, but user edits will not cause conflicts.