You signed in with another tab or window.Reload to refresh your session.You signed out in another tab or window.Reload to refresh your session.You switched accounts on another tab or window.Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/user-guides/desktop/index.md
+8Lines changed: 8 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -188,6 +188,14 @@ You can work offline, add screenshots to documentation, or use local development
188
188
File sync excludes version control system directories like`.git/` from synchronization, so keep your Git-cloned repository wherever you run Git commands.
189
189
This means that if you use an IDE with a built-in terminal to edit files on your remote workspace, that should be the Git clone and your local directory should be for file syncs.
190
190
191
+
###File sync conflicts
192
+
193
+
File sync shows a`Conflicts` status when it detects conflicting files.
194
+
195
+
You can hover your mouse over the status for the list of conflicts: