v2.0.2

scripts/generate-docs.js

@@ -57,6 +57,8 @@ async function generate() {
 	execFileSync("git", ["checkout", "gh-pages", "--", "archive"])
 	await fs.rename(r("archive"), r("dist/archive"))
 	await fs.mkdir(r(`dist/archive/v${version}`), {recursive: true})
+	// Tell Git to ignore our changes - it's no longer there.
+	execFileSync("git", ["add", "archive"])
 
 	function compilePage(file, markdown) {
 		file = path.basename(file)

scripts/release.js

@@ -139,7 +139,7 @@ exec("git", ["checkout", "master"])
 exec("git", ["pull", "--rebase", upstream.fetch.branch, "master"])
 // There may be merge conflicts with `index.js` and/or the bundle - just ignore
 // them. Whatever they have is canon, as is the case with everything else.
-exec("git", ["merge", "next", "-s", "theirs"])
+exec("git", ["merge", "next", "--strategy-option=theirs"])
 rimraf.sync(p("node_modules"))
 exec("npm", ["install-test"])