Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions content/docs/run/sync-a-folder.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.

</Step>
<Step>

Expand Down
2 changes: 1 addition & 1 deletion src/generated/cli-download.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/generated/contract-index.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/generated/marfa-release.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"v0.0.38"}
{"version":"v0.0.39"}
4 changes: 2 additions & 2 deletions src/generated/server-image.md
Original file line number Diff line number Diff line change
@@ -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
```
Loading