chore: 增加merge 类型

commitlint.config.cjs

@@ -1,29 +1,30 @@
-module.exports = {
-  extends: ['@commitlint/config-conventional'],
-  rules: {
-    'type-enum': [
-      2,
-      'always',
-      [
-        'feat', // new function
-        'fix', // fix the problem
-        'style', // modify code format
-        'refactor', // refactor code
-        'test', // add test
-        'perf', // performance optimization
-        'chore', // adding or removing dependencies, tools
-        'update', // update code
-        'revert',
-        'merge',
-        'build',
-      ],
-    ],
-    'type-case': [0],
-    'type-empty': [0],
-    'scope-empty': [0],
-    'scope-case': [0],
-    'subject-full-stop': [0, 'never'],
-    'subject-case': [0, 'never'],
-    'header-max-length': [0, 'always', 72],
-  },
-};
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'type-enum': [
+      2,
+      'always',
+      [
+        'feat', // new function
+        'fix', // fix the problem
+        'style', // modify code format
+        'refactor', // refactor code
+        'test', // add test
+        'perf', // performance optimization
+        'chore', // adding or removing dependencies, tools
+        'update', // update code
+        'revert',
+        'merge',
+        'build',
+        'merge',
+      ],
+    ],
+    'type-case': [0],
+    'type-empty': [0],
+    'scope-empty': [0],
+    'scope-case': [0],
+    'subject-full-stop': [0, 'never'],
+    'subject-case': [0, 'never'],
+    'header-max-length': [0, 'always', 72],
+  },
+};

package.json

@@ -105,6 +105,10 @@
         "revert": {
           "description": "Reverts a previous commit",
           "title": "Reverts"
+        },
+        "merge": {
+          "description": "Merge  a branch",
+          "title": "Merges"
         }
       }
     }