Skip to content

Commit 7580ea2

Browse files
authored
Update storage-files-faq.md
1 parent c008461 commit 7580ea2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

articles/storage/files/storage-files-faq.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ ms.topic: conceptual
2525

2626
* <a id="afs-conflict-resolution"></a>
2727
**If the same file is changed on two servers at approximately the same time, what happens?**
28-
File conflicts are generated when the file in the Azure file share doesn't match the file in the server endpoint location (size and/or last modified time is different).
28+
File conflicts are created when the file in the Azure file share doesn't match the file in the server endpoint location (size and/or last modified time is different).
2929

3030
The following scenarios can cause file conflicts:
31-
- A file is created or modified in an endpoint (for example, Server A). If the same file is modified on a different endpoint before the change on Server A is synced to that endpoint, a file conflict will occur.
32-
- The file existed in the Azure file share and server endpoint location prior to the server endpoint creation. If the file size and/or last modified time is different between the files on the server and Azure files share when the server endpoint is created, a file conflict is generated.
33-
- Sync database was recreated due to corruption or knowledge limit reached. Once the database is recreated, sync enters a mode called reconciliation. If the file size and/or last modified time is different between the files on the server and Azure files share when reconciliation occurs, a file conflict is generated.
31+
- A file is created or modified in an endpoint (for example, Server A). If the same file is modified on a different endpoint before the change on Server A is synced to that endpoint, a conflict file is created.
32+
- The file existed in the Azure file share and server endpoint location prior to the server endpoint creation. If the file size and/or last modified time is different between the file on the server and Azure file share when the server endpoint is created, a conflict file is created.
33+
- Sync database was recreated due to corruption or knowledge limit reached. Once the database is recreated, sync enters a mode called reconciliation. If the file size and/or last modified time is different between the file on the server and Azure file share when reconciliation occurs, a conflict file is created.
3434

3535
Azure File Sync uses a simple conflict-resolution strategy: we keep both changes to files that are changed in two endpoints at the same time. The most recently written change keeps the original file name. The older file (determined by LastWriteTime) has the endpoint name and the conflict number appended to the file name. For server endpoints, the endpoint name is the name of the server. For cloud endpoints, the endpoint name is **Cloud**. The name follows this taxonomy:
3636

0 commit comments

Comments
 (0)