Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit42e7648

Browse files
committed
file sync conflicts
1 parentc43c528 commit42e7648

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

‎docs/user-guides/desktop/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,14 @@ You can work offline, add screenshots to documentation, or use local development
188188
File sync excludes version control system directories like`.git/` from synchronization, so keep your Git-cloned repository wherever you run Git commands.
189189
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.
190190

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:
196+
197+
![Desktop file sync conflicts mouseover](../../images/user-guides/desktop/coder-desktop-file-sync-conflicts-mouseover.png)
198+
191199
If you encounter a synchronization conflict, delete the conflicting file that contains changes you don't want to keep.
192200

193201
##Accessing web apps in a secure browser context

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp