From 5fedb3a2c6834cafe9b78205255b66e4e66b4e9d Mon Sep 17 00:00:00 2001
From: yetone <yetoneful@gmail.com>
Date: Sat, 2 Aug 2025 18:43:23 +0800
Subject: [PATCH] feat: add check-added-large-files and check-merge-conflict
 pre-commit hooks

---
 .pre-commit-config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 648a82e..6ca7cbd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,6 +7,8 @@ repos:
     - id: trailing-whitespace
     - id: check-ast  # 检查Python语法错误
     - id: debug-statements  # 检查是否有debug语句
+    - id: check-added-large-files
+    - id: check-merge-conflict
 - repo: https://github.com/JohnnyMorganz/StyLua
   rev: v2.0.2
   hooks: