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

This commit is contained in:
kanpov 2023-08-23 22:09:04 +03:00 committed by GitHub
parent a1a1e7e1e0
commit 0aaf88b852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 1 additions and 3 deletions

0
content/.gitkeep Normal file
View File

View File

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

View File

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

View File

@ -162,7 +162,6 @@ yargs(hideBin(process.argv))
label: "Symlink an existing folder", label: "Symlink an existing folder",
hint: "don't select this unless you know what you are doing!", 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") { if (setupStrategy === "copy" || setupStrategy === "symlink") {
const originalFolder = escapePath( const originalFolder = escapePath(
exitIfCancel( exitIfCancel(
@ -205,8 +205,6 @@ yargs(hideBin(process.argv))
await fs.promises.symlink(originalFolder, contentFolder, "dir") await fs.promises.symlink(originalFolder, contentFolder, "dir")
} }
} else if (setupStrategy === "new") { } else if (setupStrategy === "new") {
await rmContentFolder()
await fs.promises.mkdir(contentFolder)
await fs.promises.writeFile( await fs.promises.writeFile(
path.join(contentFolder, "index.md"), path.join(contentFolder, "index.md"),
`--- `---