We are four social scientists working on a dataset that is in a secure server accessible via remote desktop. We have a shared folder where we put our code and datasets:
root -functions -data -documentation -output
Right now all we have done is to:
git init git add --a git commit
At the root of our shared folder. We have also edited a
.gitignore file to keep git from tracking images and non-plain text files.
This way, whenever one of us edits a file we go:
git add editedFile.r git commit
Which can erase the changes if the previous person who edited the same file didn't stage and commit it. Not all of us are fully conversant in git and it is likely that the more skilled will have to periodically check the status of files, stage, and commit them for the ones who don't git yet.
Each of us also has our own private folder on the same servers. We potentially could have each our own local repository in our private folders, and treat the shared folder as a remote. Then we would:
git pull git add editedFile.r git commit git push
As we go by our workday.
Which one would work better for the situation described: fork and pull (each one with our own repository and the shared as a remote) or all work on the same repo in the shared folder?