Fix #403 by moving documentation to separate directory to avoid merge conflicts (#405)

2023-08-23 22:09:04 +03:00 · 2023-08-23 22:09:04 +03:00 · 0aaf88b852
commit 0aaf88b852
parent a1a1e7e1e0
39 changed files with 1 additions and 3 deletions
--- a/content/.gitkeep
+++ b/content/.gitkeep
--- a/content/advanced/architecture.md
+++ b/content/advanced/architecture.md
--- a/content/advanced/creating
+++ b/content/advanced/creating
--- a/content/advanced/making
+++ b/content/advanced/making
--- a/content/advanced/paths.md
+++ b/content/advanced/paths.md
--- a/content/authoring
+++ b/content/authoring
--- a/content/build.md
+++ b/content/build.md
--- a/content/configuration.md
+++ b/content/configuration.md
--- a/content/features/Latex.md
+++ b/content/features/Latex.md
--- a/content/features/Mermaid
+++ b/content/features/Mermaid
--- a/content/features/Obsidian
+++ b/content/features/Obsidian
--- a/content/features/RSS
+++ b/content/features/RSS
--- a/content/features/SPA
+++ b/content/features/SPA
--- a/content/features/backlinks.md
+++ b/content/features/backlinks.md
--- a/content/features/callouts.md
+++ b/content/features/callouts.md
--- a/content/features/darkmode.md
+++ b/content/features/darkmode.md
--- a/content/features/folder
+++ b/content/features/folder
--- a/content/features/full-text
+++ b/content/features/full-text
--- a/content/features/graph
+++ b/content/features/graph
--- a/content/features/index.md
+++ b/content/features/index.md
--- a/content/features/popover
+++ b/content/features/popover
--- a/content/features/private
+++ b/content/features/private
--- a/content/features/recent
+++ b/content/features/recent
--- a/content/features/syntax
+++ b/content/features/syntax
--- a/content/features/table
+++ b/content/features/table
--- a/content/features/upcoming
+++ b/content/features/upcoming
--- a/content/features/wikilinks.md
+++ b/content/features/wikilinks.md
--- a/content/hosting.md
+++ b/content/hosting.md
--- a/content/images/dns
+++ b/content/images/dns
--- a/content/images/quartz
+++ b/content/images/quartz
--- a/content/images/quartz
+++ b/content/images/quartz
--- a/content/index.md
+++ b/content/index.md
--- a/content/layout.md
+++ b/content/layout.md
--- a/content/migrating
+++ b/content/migrating
--- a/content/philosophy.md
+++ b/content/philosophy.md
--- a/content/showcase.md
+++ b/content/showcase.md
--- a/content/tags/component.md
+++ b/content/tags/component.md
--- a/content/upgrading.md
+++ b/content/upgrading.md
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@ -162,7 +162,6 @@ yargs(hideBin(process.argv))
            label: "Symlink an existing folder",
            hint: "don't select this unless you know what you are doing!",
          },
-          { value: "keep", label: "Keep the existing files" },
        ],
      }),
    )
@ -176,6 +175,7 @@ yargs(hideBin(process.argv))
      }
    }

+    await fs.promises.unlink(path.join(contentFolder, ".gitkeep"))
    if (setupStrategy === "copy" || setupStrategy === "symlink") {
      const originalFolder = escapePath(
        exitIfCancel(
@ -205,8 +205,6 @@ yargs(hideBin(process.argv))
        await fs.promises.symlink(originalFolder, contentFolder, "dir")
      }
    } else if (setupStrategy === "new") {
-      await rmContentFolder()
-      await fs.promises.mkdir(contentFolder)
      await fs.promises.writeFile(
        path.join(contentFolder, "index.md"),
        `---