From 0aaf88b8521e2bc667cae525356eea3550ad9c96 Mon Sep 17 00:00:00 2001
From: kanpov <71177577+kanpov@users.noreply.github.com>
Date: Wed, 23 Aug 2023 19:09:04 +0000
Subject: [PATCH] Fix #403 by moving documentation to separate directory to avoid merge conflicts (#405)
---
quartz/bootstrap-cli.mjs | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 1656d75..b973317 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -162,7 +162,6 @@
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 @@
}
}
+ await fs.promises.unlink(path.join(contentFolder, ".gitkeep"))
if (setupStrategy === "copy" || setupStrategy === "symlink") {
const originalFolder = escapePath(
exitIfCancel(
@@ -205,8 +205,6 @@
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"),
`---
--
Gitblit v1.10.0