Dropbox and git, could it cause conflicts?

Question

What if one hosts a code repo in the Dropbox folder and shares it with others who collaborate. What happens if two people push to the Dropbox repo at the same time? Could this cause conflicts that mess up git?

Answer 1

I tested this here: http://edinburghhacklab.com/2012/11/when-git-on-dropbox-conflicts-no-problem/

Conflicts are minor issues. When a corruption occurs no-one can push, so its not a fail silently situation. The fix is to remove all files in dropbox with the (XXX's conflicted copy) suffix.

After that is done someone's commit will not have gone through, so they should just git push again and it will all be fixed!

I have been using this setup for some time very successfully.

Answer 2

Dropbox is not the right kind of hosting service to share Git repositories. You can get all kinds of trouble in the moment when a conflict inside .git/ occurs (and such conflicts can even occur in a unchanged repo, for example when one runs git gc), since the content of the .git directory is not designed to be easily merged.

You can use https://bitbucket.org as an provider when you don't want public accessible repos.