From 93c5146f4552333e96420392a49b932f34acfccf Mon Sep 17 00:00:00 2001 From: August Cayzer Date: Tue, 27 Oct 2026 01:37:57 +0000 Subject: [PATCH 1/2] docs(run): recommend a git-ignored folder beside code and sync the git warning --- content/docs/run/sync-a-folder.mdx | 2 ++ src/generated/cli-download.md | 2 +- src/generated/contract-index.json | 7 +++++++ src/generated/marfa-release.json | 2 +- src/generated/server-image.md | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/content/docs/run/sync-a-folder.mdx b/content/docs/run/sync-a-folder.mdx index f882c5be..22017e9a 100644 --- a/content/docs/run/sync-a-folder.mdx +++ b/content/docs/run/sync-a-folder.mdx @@ -81,6 +81,8 @@ Where an item's file would land on a file the folder will send, one of the two g Keep the directory out of iCloud Drive, other cloud-synced folders and network storage: two programs syncing the same files can overwrite each other's changes. `marfa folders add` warns and goes on. +**For reference records kept beside code, use a folder inside the repository that git ignores.** Name it `marfa/`, add `marfa/` to `.gitignore`, and add that directory. Don't name it `.marfa`: every folder already holds a `.marfa` directory of its own, which has its store and `folder.yaml`, as `.git` does in a repository. Anywhere else, any directory works. If git tracks the directory, a checkout, reset or branch switch changes those files and Marfa syncs the changes, so git and Marfa both change the same files. `marfa folders add` warns and goes on, so you can back up a folder through git on purpose. + diff --git a/src/generated/cli-download.md b/src/generated/cli-download.md index 520d950a..671013b6 100644 --- a/src/generated/cli-download.md +++ b/src/generated/cli-download.md @@ -1,5 +1,5 @@ ```bash -curl -fsSL https://github.com/withmarfa/marfa/releases/download/v0.0.38/marfa-0.0.38-darwin-arm64.tar.gz | tar -xz +curl -fsSL https://github.com/withmarfa/marfa/releases/download/v0.0.39/marfa-0.0.39-darwin-arm64.tar.gz | tar -xz sudo mkdir -p /usr/local/bin sudo mv marfa /usr/local/bin/ marfa --version diff --git a/src/generated/contract-index.json b/src/generated/contract-index.json index 9507eb66..e6a415d5 100644 --- a/src/generated/contract-index.json +++ b/src/generated/contract-index.json @@ -1219,6 +1219,8 @@ "device/index-order": "5af6c4e3a20e0e3a", "device/index-unsearchable": "c11eb9679e644c7b", "device/index-undeclared": "ff822a32be8b729d", + "device/index-file-text": "5f46a42c3f372806", + "device/index-file-text-pending": "c7cb3ea65ca731ab", "device/index-type-change": "7c558f8f055d0670", "device/rank-bm25": "a9f48ebef4474fb2", "device/rank-ties": "357751477aeffd7d", @@ -2951,6 +2953,9 @@ "folders/icloud-ubiquitous-warns": "914ac23dd1b6b948", "folders/cloud-storage-warns": "00f82c6052ba2428", "folders/network-storage-warns": "1b61ba5c8a586f51", + "folders/git-tracked-warns": "1df485efa330dd6d", + "folders/git-tracked-continues": "008c13195b8459fe", + "folders/git-untracked-silent": "f34f611550ec6778", "folders/storage-warning-continues": "6e67f6931e68a418", "folders/storage-warning-once": "ab1c58dbf82528ca", "folders/storage-warning-elsewhere": "65aa359fe450bfd7", @@ -4838,6 +4843,8 @@ "search-and-filters/index-fields": "fc3c5ea99c49a336", "search-and-filters/index-order": "074148e8ff0798af", "search-and-filters/index-undeclared": "fe5718b8a6fb8c23", + "search-and-filters/search-file-text": "f75fd5f4370c7062", + "search-and-filters/search-file-text-pending": "9e9cd55973be9607", "search-and-filters/index-not-string": "33d7f1a786109e49", "search-and-filters/index-unregistered": "2dd0a003c851c5ca", "search-and-filters/index-type-change": "af5efe6ffcde8a13", diff --git a/src/generated/marfa-release.json b/src/generated/marfa-release.json index 808833ad..bd83e561 100644 --- a/src/generated/marfa-release.json +++ b/src/generated/marfa-release.json @@ -1 +1 @@ -{"version":"v0.0.38"} +{"version":"v0.0.39"} diff --git a/src/generated/server-image.md b/src/generated/server-image.md index cc7f78f6..b78f9188 100644 --- a/src/generated/server-image.md +++ b/src/generated/server-image.md @@ -1,5 +1,5 @@ ```bash -docker pull ghcr.io/withmarfa/marfa-server:0.0.38 +docker pull ghcr.io/withmarfa/marfa-server:0.0.39 docker run --name marfa -d --restart unless-stopped -p 127.0.0.1:8600:8600 \ - -v marfa-data:/data --env-file marfa.env ghcr.io/withmarfa/marfa-server:0.0.38 + -v marfa-data:/data --env-file marfa.env ghcr.io/withmarfa/marfa-server:0.0.39 ``` From 6021cf478593b528c8e41eadd837c198c517258a Mon Sep 17 00:00:00 2001 From: August Cayzer Date: Tue, 27 Oct 2026 02:08:12 +0000 Subject: [PATCH 2/2] docs(run): say the ignored directory is added as the folder --- content/docs/run/sync-a-folder.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/run/sync-a-folder.mdx b/content/docs/run/sync-a-folder.mdx index 22017e9a..bb98b234 100644 --- a/content/docs/run/sync-a-folder.mdx +++ b/content/docs/run/sync-a-folder.mdx @@ -81,7 +81,7 @@ Where an item's file would land on a file the folder will send, one of the two g Keep the directory out of iCloud Drive, other cloud-synced folders and network storage: two programs syncing the same files can overwrite each other's changes. `marfa folders add` warns and goes on. -**For reference records kept beside code, use a folder inside the repository that git ignores.** Name it `marfa/`, add `marfa/` to `.gitignore`, and add that directory. Don't name it `.marfa`: every folder already holds a `.marfa` directory of its own, which has its store and `folder.yaml`, as `.git` does in a repository. Anywhere else, any directory works. If git tracks the directory, a checkout, reset or branch switch changes those files and Marfa syncs the changes, so git and Marfa both change the same files. `marfa folders add` warns and goes on, so you can back up a folder through git on purpose. +**For reference records kept beside code, use a folder inside the repository that git ignores.** Name it `marfa/`, add `marfa/` to `.gitignore`, and add that directory as the folder. Don't name it `.marfa`: every folder already holds a `.marfa` directory of its own, which has its store and `folder.yaml`, as `.git` does in a repository. Anywhere else, any directory works. If git tracks the directory, a checkout, reset or branch switch changes those files and Marfa syncs the changes, so git and Marfa both change the same files. `marfa folders add` warns and goes on, so you can back up a folder through git on purpose.