Skip to content

docs: add file sync to coder desktop docs #17463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

docs: add file sync to coder desktop docs #17463

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
940bfe6
beta tag; confirm steps
EdwardAngert Apr 17, 2025
749d839
desktop file sync
EdwardAngert Apr 17, 2025
9dd403e
Merge branch 'main' into 16869-desktop-file-sync
EdwardAngert Apr 17, 2025
b1f9356
sync direction and merge conflict resolution
EdwardAngert Apr 21, 2025
c43c528
add status tooltip
EdwardAngert Apr 22, 2025
42e7648
file sync conflicts
EdwardAngert Apr 22, 2025
e02a3ab
Merge branch 'main' into 16869-desktop-file-sync
EdwardAngert Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
file sync conflicts
  • Loading branch information
@EdwardAngert
EdwardAngert committed Apr 22, 2025
commit 42e76485de34e331c3aea5588c103e1ca104b0cc
Binary file added docs/images/user-guides/desktop/coder-desktop-file-sync-conflicts-mouseover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions docs/user-guides/desktop/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,14 @@ You can work offline, add screenshots to documentation, or use local development
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.

### File sync conflicts

File sync shows a `Conflicts` status when it detects conflicting files.

You can hover your mouse over the status for the list of conflicts:

![Desktop file sync conflicts mouseover](../../images/user-guides/desktop/coder-desktop-file-sync-conflicts-mouseover.png)

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
Expand Down
Loading