fix: try skipping lunaria when merging

Author: danielroe

lunaria/lunaria.ts

@@ -1,9 +1,16 @@
 import { createLunaria } from '@lunariajs/core'
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { Page } from './components.ts'
 import { lunariaJSONFiles, prepareJsonFiles } from './prepare-json-files.ts'
 import type { I18nStatus } from '../shared/types/i18n-status.ts'
 
+// skip lunaria during git merges as git history may be in an inconsistent state.
+if (existsSync('.git/MERGE_HEAD')) {
+  // eslint-disable-next-line no-console
+  console.log('Skipping lunaria: git merge in progress')
+  process.exit(0)
+}
+
 await prepareJsonFiles()
 
 const lunaria = await createLunaria()

package.json

@@ -145,7 +145,7 @@
     "node": "24"
   },
   "simple-git-hooks": {
-    "pre-commit": "[ -n \"$NO_VERIFY\" ] && exit 0\nnpx lint-staged"
+    "pre-commit": "npx lint-staged"
   },
   "lint-staged": {
     "i18n/locales/*": [