sync direction and merge conflict resolution

coder · EdwardAngert · May 14, 2025 · Apr 17, 2025 · Apr 17, 2025 · Apr 17, 2025
commit b1f935649f83af72771979ce6f7e67c23a94ee48
diff --git a/docs/user-guides/desktop/index.md b/docs/user-guides/desktop/index.md
@@ -164,7 +164,8 @@ Use `ping` in a Command Prompt or PowerShell terminal to verify the connection t
 
 ## Sync a local directory with your workspace
 
-If you're working offline or adding screenshots to your documentation, Coder Desktop file sync can make it easier to move files to your workspace.
+Coder Desktop file sync provides bidirectional synchronization between a local directory and your workspace.
+You can work offline, add screenshots to documentation, or use local development tools while keeping your files in sync with your workspace.
 
 1. Create a new local directory.
 
@@ -182,6 +183,11 @@ If you're working offline or adding screenshots to your documentation, Coder Des
 
    ![Coder Desktop File Sync watching](../../images/user-guides/desktop/coder-desktop-file-sync-watching.png)
 
+File sync excludes version control system directories like `.git/` from synchronization, so keep your Git-cloned repository wherever you run Git commands.
+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.
+
+If you encounter a synchronization conflict, delete the conflicting file that contains changes you don't want to keep.
+
 ## Accessing web apps in a secure browser context
 
 Some web applications require a [secure context](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts) to function correctly.