Child Item

Why am i getting conflicted copies when using git commands onMacOS Ventura with Dropbox desktop app

I've been working with the git command on my local machine and using dropbox-backed storage /folders for years with no issue.

I upgraded to a Mac Studio and MacOS Ventura. When I did that, I went back to coding, but discovered a number of conflicted files were created while Dropbox indexed my folder on the new machine. Is it possible that the conflicts were created because I started using the folders before they were fully indexed ?

I'd like to understand what happened so I can avoid it in the future.

Find more posts tagged with

Desktop

Sync

Dropbox Business

Mac

Insightful

Closed - Partially Delivered

Accepted answers

Jay

Generally, when the app is indexing, we recommend users to allow it to finish to ensure the app works normally.

Editing files while there is normal syncing shouldn't cause any issues. There have been a few rare instances in the community where users have reported that their files are written to and saved continuously multiple times within a second or two (as part of their own workflow) and this is when the app tries to sync the file and could cause a conflict or other issue.

All comments

Jay

Hi @mgw1, thanks for bringing this to our attention.

When you changed your device, did you use the Apple Migration Assistant, or allow Dropbox to begin syncing files from the site completely?

Were both devices using the new File Provider version (where the Dropbox folder is in Library/CloudStorage), or the older version?

This will help me to assist further!

mgw1

Hi,

The dropbox files were/are being stored on an external drive. So we just reattached the external drive to the new computer.

So, although I use the Migration assistant to move files from my root/internal drive on the old computer to the root/internal drive on my new computer, I didn't use it to copy any Dropbox-backed files.

As an unwanted side effect, the Migration Assistant copied the /Volume mount points as folder. So the old mount point was copied to my new internal drive. When I reattached the drive, instead of using the old mount point, a new mount point was created with '1' appended to the end of the mount point.

As a result, Dropbox decided to re-index everything, I believe because it had a "new" Preferences->Sync->Folder location.

The Dropbox app is not using the File Provider as far as I know, because I prefer to host my files on an external drive.

Other wise my built in drive would be overfull.

Thank you for reaching out!

Jay

Thanks for the info, this is probably the reason that you received conflicted copies on the files, since the location was different and hadn't yet finished indexing.

Are you still experiencing this issue after the completion of the indexing?

mgw1

Jay, What is indexing? What are we supposed to do while indexing is happening? What is the difference between indexing and syncing?

What are we to do with git files that have conflicts?

Jay

Indexing is when the Dropbox desktop application is performing checks on the files to ensure they are in the correct location and status. This usually takes time when a new installation of the desktop is performed, since it needs to make numerous checks of all files.

Syncing is when changes are detected by the desktop app or from the website, and the app syncs the changes between the two.

For any conflicted files, there isn't a way to automatically merge or delete them. You'll need to manually check the files to see if any need to be kept or deleted, and then make the change on your end.

mgw1

Thanks for that explanation Jay. So, are we as users not supposed to use our dropbox while it is indexing or syncing?

Is that how the conflicted copies get created? Because in my case there are no other users of the git source code metadata

that got conflicted.

Jay

Generally, when the app is indexing, we recommend users to allow it to finish to ensure the app works normally.