|
|
|
|
|
by eli
4288 days ago
|
|
Maybe it's better now, but I've had problems with .git folders in dropbox. Dropbox doesn't understand the directory structure and conflicts are handled by merging competing .git folders and renaming internal files as needed -- almost certainly not what you want. |
|
First of all, Dropbox will not overwrite data. If it finds a conflict, it will save a second file with "[machine name]'s Conflicted Copy" and the modification date at the end.
This hasn't happened to me with any git files yet, however, because my machines are always online. That means my working tree is always the same across devices and my .git folder is always identical.
The only way a conflict would be created is if I committed while working offline and then committed on another machine while working offline.
If that happens, I could just grep my Dropbox folder for files with "conflicted" in the name and remove them. Or, because I committed my files to a remote (often Github, but sometimes others), I could just delete the local copy and clone.