From 28de5bb487e09182955206dbb32f28ba4045fe46 Mon Sep 17 00:00:00 2001 From: August Cayzer Date: Fri, 23 Oct 2026 01:58:38 +0100 Subject: [PATCH 1/2] docs(guides): say a running sync never writes back a moved or deleted file --- content/docs/guides/folder-safeguards.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/docs/guides/folder-safeguards.mdx b/content/docs/guides/folder-safeguards.mdx index 47ce6596..6db9cea7 100644 --- a/content/docs/guides/folder-safeguards.mdx +++ b/content/docs/guides/folder-safeguards.mdx @@ -9,7 +9,8 @@ A folder deletes in both directions: a file you remove can send its item to the | What happens | What the folder does | | --- | --- | -| **You delete a file** | Moves its item to the bin after a five-second grace, so a save that replaces a file isn't taken for a delete. | +| **You delete a file** | Moves its item to the bin after a five-second grace, so a save that replaces a file isn't taken for a delete. A sync that is running when you delete the file doesn't write it back. | +| **You move or rename a file in the folder** | Keeps its item, even when the move lands while a sync is running. The folder never writes the file back where it was. | | **An item is moved to the bin, purged, or leaves the states the search holds** | Removes its file at the next sync. A file you changed since Marfa wrote it stays. | | **An item stops matching the search** | Keeps its file, and edits to the file still reach the item. [`marfa folders unmatched`](/guides/keep-folders-running#remove-files-a-folder-keeps-but-no-longer-holds) lists these files. | | **You move a file to another folder on the same Mac** | Treats it as the same item, so the folder it left doesn't take the move for a delete. | From 4afa07746ca26c76f78f62e77882efa57b91c19b Mon Sep 17 00:00:00 2001 From: August Cayzer Date: Fri, 23 Oct 2026 02:32:17 +0100 Subject: [PATCH 2/2] docs(guides): say a moved file is not written back, not never --- content/docs/guides/folder-safeguards.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/guides/folder-safeguards.mdx b/content/docs/guides/folder-safeguards.mdx index 6db9cea7..1bafa35b 100644 --- a/content/docs/guides/folder-safeguards.mdx +++ b/content/docs/guides/folder-safeguards.mdx @@ -10,7 +10,7 @@ A folder deletes in both directions: a file you remove can send its item to the | What happens | What the folder does | | --- | --- | | **You delete a file** | Moves its item to the bin after a five-second grace, so a save that replaces a file isn't taken for a delete. A sync that is running when you delete the file doesn't write it back. | -| **You move or rename a file in the folder** | Keeps its item, even when the move lands while a sync is running. The folder never writes the file back where it was. | +| **You move or rename a file in the folder** | Keeps its item, even when the move lands while a sync is running, and doesn't write the file back where it was. | | **An item is moved to the bin, purged, or leaves the states the search holds** | Removes its file at the next sync. A file you changed since Marfa wrote it stays. | | **An item stops matching the search** | Keeps its file, and edits to the file still reach the item. [`marfa folders unmatched`](/guides/keep-folders-running#remove-files-a-folder-keeps-but-no-longer-holds) lists these files. | | **You move a file to another folder on the same Mac** | Treats it as the same item, so the folder it left doesn't take the move for a delete. |