From e303d4dc1ee100ba618f6e82aedf427251b2334f Mon Sep 17 00:00:00 2001
From: david-ajax <david-ajax@outlook.com>
Date: Sun, 21 Dec 2025 06:34:17 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=90=88=E5=B9=B6=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTING.md                 | 6 ++++--
 src/heurams/services/version.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 941562c..f51df26 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,13 +10,15 @@
    - `dev` 分支: 开发版本
    - 功能分支: 从 `dev` 分支创建, 命名格式为 `feature/描述` 或 `fix/描述` 或 `refactor/描述`
 2. **代码风格**: 
-   - 请使用 Black 格式化代码
+   - 请使用 Black 与 isort 格式化代码
    - 遵循 PEP 8 规范
    - 添加适当的文档字符串  
 3. **提交消息**: 
    - 使用简体中文或英文撰写清晰的提交消息
    - 格式: 遵循 Conventional Commits 规范
-
+4. **合并方式**:
+   - 不使用 Fast-forward 合并
+   - 可以设置 `git config merge.ff false`
 ## 设置开发环境
 
 ```bash
diff --git a/src/heurams/services/version.py b/src/heurams/services/version.py
index 57f3af5..cd501b1 100644
--- a/src/heurams/services/version.py
+++ b/src/heurams/services/version.py
@@ -3,7 +3,7 @@ from heurams.services.logger import get_logger
 
 logger = get_logger(__name__)
 
-ver = "0.4.1"
+ver = "0.4.2"
 stage = "prototype"
 codename = "fledge"  # 雏鸟, 0.4.x 版本