Check for conflicted copies in Dropbox, and then either:
- show the user a list of all conflicts
- reveal conflicted files in Finder (one at a time)
- compare conflicted files using BBEdit's bbdiff tool
| Name | Name | Last commit date | ||
|---|---|---|---|---|
Check for conflicted copies in Dropbox, and then either: