预合并验证指南：代码合并前全面检查清单与自动化脚本

pre-merge by bobmatnyc/claude-mpm-skills

109 周安装量

29 GitHub Stars

GitHub

安装命令

npx skills add https://github.com/bobmatnyc/claude-mpm-skills --skill pre-merge

自动化代码质量开发运维

🇨🇳中文介绍

预合并验证

在将更改合并到生产环境之前进行全面的验证工作流程。

何时使用此技能

在以下情况下使用此技能：

创建拉取请求以供审查时
即将将代码合并到主分支/生产分支时
需要系统化的验证清单时
希望在代码审查前发现问题时

提交前验证

提交代码前，请验证：

类型检查通过（适用于相应语言：tsc --noEmit、mypy 等）
代码检查通过且无错误（ESLint、Pylint 等）
所有现有测试在本地通过
代码中没有遗留的 console.log/调试语句
代码遵循项目风格指南
没有注释掉的代码块

按语言划分的命令

TypeScript/JavaScript：

# 类型检查
npx tsc --noEmit

# 代码检查
npm run lint
# 或：pnpm lint
# 或：npx eslint .

# 测试
npm test
# 或：pnpm test

Python：

# 类型检查
mypy src/

# 代码检查
pylint src/
# 或：flake8 src/
# 或：ruff check src/

# 测试
pytest
# 或：python -m pytest

广告位招租

在这里展示您的产品或服务

触达数万 AI 开发者，精准高效

联系我们

安全检查清单（如果涉及 API 更改）

受保护路由需要身份验证
已实现授权检查
使用模式进行输入验证（Zod、Pydantic 等）
日志中无敏感数据
无 SQL 注入漏洞
无 XSS 漏洞
已考虑速率限制

数据库更改（如果涉及模式更改）

已创建迁移文件
已在本地数据库测试迁移
已在暂存数据库测试迁移
提供向下迁移（回滚计划）
无迁移指南的情况下无破坏性更改
已记录模式更改

UI 更改（如果适用）

包含截图：
- 桌面视图（1920x1080）
- 平板视图（768x1024）
- 移动视图（375x667）
已验证响应式行为
已检查可访问性（键盘导航、屏幕阅读器）
已实现加载状态
已实现错误状态

合并到主分支前，请确认：

所有 CI 检查通过（代码检查、类型检查、测试、构建）
代码审查已获得至少一名审查者批准
更改文件中无 TypeScript 错误
与目标分支无合并冲突
构建成功且无警告

数据库迁移成功运行（如果适用）
现有功能无回归
性能基准在可接受范围内
关键路径已完成手动测试

已更新 CHANGELOG.md（如果使用）
已更新 API 文档（如果涉及 API 更改）
已更新 README（如果设置/使用方式有更改）
已提供迁移指南（如果有破坏性更改）

使用此模板创建全面的 PR 描述：

## 摘要
[简要描述此 PR 的功能]

## 相关工单
- 修复 #123
- 关闭 ENG-456
- 关联 HEL-789

## 更改
- [ ] 功能：[描述]
- [ ] 错误修复：[描述]
- [ ] 重构：[描述]
- [ ] 文档：[描述]

## 测试
### 单元测试
- 为 [功能/函数] 添加了测试
- 覆盖率：X%

### 手动测试
- [ ] 在桌面端测试（Chrome、Firefox、Safari）
- [ ] 在移动端测试（iOS Safari、Android Chrome）
- [ ] 测试边界情况：[列出具体案例]

## 截图
### 桌面端
![桌面视图](screenshot-url)

### 平板端
![平板视图](screenshot-url)

### 移动端
![移动视图](screenshot-url)

## 破坏性更改
[列出任何破坏性更改或写"无"]

### 迁移指南
[如果有破坏性更改，提供迁移步骤]

## 性能影响
[描述任何性能影响或写"无影响"]

## 安全考虑
[描述安全影响或写"无安全影响"]

## 回滚计划
[描述如果出现问题如何回滚]

## 部署说明
[任何特殊的部署考虑事项或写"标准部署"]

❌ 提交测试失败的代码
❌ 遗留 console.log/调试语句
❌ 未运行类型检查器就提交
❌ 提交大块注释掉的代码

❌ 创建没有描述的 PR
❌ UI 更改缺少截图
❌ 未链接到相关工单
❌ 未记录破坏性更改
❌ 新代码缺少测试覆盖

❌ 合并 CI 检查失败的代码
❌ 未经代码审查批准就合并
❌ 合并存在冲突的代码
❌ 未测试迁移就合并
❌ 未考虑回滚计划就合并

创建提交前验证脚本：

JavaScript/TypeScript (pre-commit.sh)：

#!/bin/bash
set -e

echo "运行类型检查..."
npx tsc --noEmit

echo "运行代码检查..."
npm run lint

echo "运行测试..."
npm test -- --run

echo "✅ 所有检查通过！"

Python (pre-commit.sh)：

#!/bin/bash
set -e

echo "运行类型检查..."
mypy src/

echo "运行代码检查..."
pylint src/

echo "运行测试..."
pytest

echo "✅ 所有检查通过！"

设置为可执行：

chmod +x pre-commit.sh

使用 Git 钩子自动化

设置自动提交前检查：

使用 Husky (JavaScript/TypeScript)

npm install --save-dev husky
npx husky install
npx husky add .husky/pre-commit "npm run lint && npm test"

使用 pre-commit (Python)

创建 .pre-commit-config.yaml：

repos:
  - repo: local
    hooks:
      - id: type-check
        name: Type Check
        entry: mypy src/
        language: system
        pass_filenames: false
      - id: lint
        name: Lint
        entry: pylint src/
        language: system
        pass_filenames: false
      - id: test
        name: Test
        entry: pytest
        language: system
        pass_filenames: false

pre-commit install

✅ 所有本地检查通过
✅ 代码格式正确
✅ 无调试语句遗留
✅ 测试在本地通过

✅ PR 描述全面
✅ 包含所有必需信息
✅ 已附加截图（如果涉及 UI 更改）
✅ 已记录破坏性更改

✅ CI 流水线为绿色
✅ 代码审查已批准
✅ 与目标分支无冲突
✅ 已完成手动测试

universal-verification-screenshot - UI 更改的截图验证
universal-verification-bug-fix - 错误修复验证工作流程
toolchains-universal-security-api-review - API 安全测试
universal-collaboration-git-workflow - Git 工作流程最佳实践

🇺🇸English

Pre-Merge Verification

Comprehensive verification workflow before merging changes to production.

When to Use This Skill

Use this skill when:

Creating a pull request for review
About to merge code to main/production branch
Need systematic verification checklist
Want to catch issues before code review

Pre-Commit Verification

Before committing code, verify:

Type checking passes (language-appropriate: tsc --noEmit, mypy, etc.)
Linting passes with no errors (ESLint, Pylint, etc.)
All existing tests pass locally
No console.log/debug statements left in code
Code follows project style guide
No commented-out code blocks

Commands by Language

TypeScript/JavaScript :

# Type check
npx tsc --noEmit

# Lint
npm run lint
# or: pnpm lint
# or: npx eslint .

# Tests
npm test
# or: pnpm test

Python :

# Type check
mypy src/

# Lint
pylint src/
# or: flake8 src/
# or: ruff check src/

# Tests
pytest
# or: python -m pytest

Go :

# Format check
gofmt -l .

# Lint
golangci-lint run

# Tests
go test ./...

Pre-PR Verification

Before creating a pull request, ensure:

Required Information

Changeset added for user-facing changes (if using changesets)
PR description is complete with:
- Summary of changes
- Related ticket references (ENG-XXX, HEL-XXX, JIRA-XXX, etc.)
- Screenshots for UI changes (desktop, tablet, mobile)
- Breaking changes documented
- Migration guide (if breaking changes)
New tests added for new functionality
Documentation updated if needed (README, API docs, etc.)

Security Checklist (if API changes)

Authentication required on protected routes
Authorization checks implemented
Input validation with schema (Zod, Pydantic, etc.)
No sensitive data in logs
No SQL injection vulnerabilities
No XSS vulnerabilities
Rate limiting considered

Database Changes (if schema changes)

Migration file created
Migration tested on local database
Migration tested on staging database
Down migration available (rollback plan)
No breaking changes without migration guide
Schema changes documented

UI Changes (if applicable)

Screenshots included:
- Desktop view (1920x1080)
- Tablet view (768x1024)
- Mobile view (375x667)
Responsive behavior verified
Accessibility checked (keyboard navigation, screen readers)
Loading states implemented
Error states implemented

Pre-Merge Verification

Before merging to main branch, confirm:

CI/CD Checks

All CI checks pass (lint, type-check, tests, build)
Code review approved by at least one reviewer
No TypeScript errors in changed files
No merge conflicts with target branch
Build succeeds without warnings

Functional Verification

Database migrations run successfully (if applicable)
No regression in existing functionality
Performance benchmarks within acceptable range
Manual testing completed for critical paths

Documentation

CHANGELOG.md updated (if using)
API documentation updated (if API changes)
README updated (if setup/usage changes)
Migration guide provided (if breaking changes)

PR Description Template

Use this template for comprehensive PR descriptions:

## Summary
[Brief description of what this PR does]

## Related Tickets
- Fixes #123
- Closes ENG-456
- Related to HEL-789

## Changes
- [ ] Feature: [Description]
- [ ] Bug Fix: [Description]
- [ ] Refactor: [Description]
- [ ] Documentation: [Description]

## Testing
### Unit Tests
- Added tests for [feature/function]
- Coverage: X%

### Manual Testing
- [ ] Tested on desktop (Chrome, Firefox, Safari)
- [ ] Tested on mobile (iOS Safari, Android Chrome)
- [ ] Tested edge cases: [list specific cases]

## Screenshots
### Desktop
![Desktop view](screenshot-url)

### Tablet
![Tablet view](screenshot-url)

### Mobile
![Mobile view](screenshot-url)

## Breaking Changes
[List any breaking changes or write "None"]

### Migration Guide
[If breaking changes, provide migration steps]

## Performance Impact
[Describe any performance implications or write "No impact"]

## Security Considerations
[Describe security implications or write "No security impact"]

## Rollback Plan
[Describe how to rollback if issues occur]

## Deployment Notes
[Any special deployment considerations or write "Standard deployment"]

Common Pitfalls to Avoid

Pre-Commit

❌ Committing code with failing tests
❌ Leaving console.log/debug statements
❌ Committing without running type checker
❌ Committing large blocks of commented code

Pre-PR

❌ Creating PR without description
❌ Missing screenshots for UI changes
❌ Not linking to related tickets
❌ Not documenting breaking changes
❌ Missing test coverage for new code

Pre-Merge

❌ Merging with failing CI checks
❌ Merging without code review approval
❌ Merging with merge conflicts
❌ Merging without testing migrations
❌ Merging without considering rollback plan

Quick Verification Script

Create a pre-commit verification script:

JavaScript/TypeScript (pre-commit.sh) :

#!/bin/bash
set -e

echo "Running type check..."
npx tsc --noEmit

echo "Running linter..."
npm run lint

echo "Running tests..."
npm test -- --run

echo "✅ All checks passed!"

Python (pre-commit.sh) :

#!/bin/bash
set -e

echo "Running type check..."
mypy src/

echo "Running linter..."
pylint src/

echo "Running tests..."
pytest

echo "✅ All checks passed!"

Make executable:

chmod +x pre-commit.sh

Automation with Git Hooks

Set up automatic pre-commit checks:

Using Husky (JavaScript/TypeScript)

npm install --save-dev husky
npx husky install
npx husky add .husky/pre-commit "npm run lint && npm test"

Using pre-commit (Python)

Create .pre-commit-config.yaml:

repos:
  - repo: local
    hooks:
      - id: type-check
        name: Type Check
        entry: mypy src/
        language: system
        pass_filenames: false
      - id: lint
        name: Lint
        entry: pylint src/
        language: system
        pass_filenames: false
      - id: test
        name: Test
        entry: pytest
        language: system
        pass_filenames: false

Install hooks:

pre-commit install

Success Criteria

Pre-Commit Success

✅ All local checks pass
✅ Code is formatted correctly
✅ No debug statements remain
✅ Tests pass locally

Pre-PR Success

✅ PR description is comprehensive
✅ All required information included
✅ Screenshots attached (if UI changes)
✅ Breaking changes documented

Pre-Merge Success

✅ CI pipeline is green
✅ Code review approved
✅ No conflicts with target branch
✅ Manual testing completed

Related Skills

universal-verification-screenshot - Screenshot verification for UI changes
universal-verification-bug-fix - Bug fix verification workflow
toolchains-universal-security-api-review - API security testing
universal-collaboration-git-workflow - Git workflow best practices

Weekly Installs

Repository

bobmatnyc/claud…m-skills

GitHub Stars

First Seen

Jan 23, 2026

Security Audits

Gen Agent Trust HubPass SocketPass SnykPass

Installed on

claude-code70

codex69

opencode68

gemini-cli67

cursor65

github-copilot63

Azure Data Explorer (Kusto) 查询技能：KQL数据分析、日志遥测与时间序列处理

138,800 周安装

预合并验证指南：代码合并前全面检查清单与自动化脚本

🇨🇳中文介绍

预合并验证

何时使用此技能

提交前验证

按语言划分的命令

相关 Skills

创建 PR 前验证

必需信息

安全检查清单（如果涉及 API 更改）

数据库更改（如果涉及模式更改）

UI 更改（如果适用）

合并前验证

CI/CD 检查

功能验证

文档

PR 描述模板

常见陷阱避免

提交前

创建 PR 前

合并前

快速验证脚本

使用 Git 钩子自动化

使用 Husky (JavaScript/TypeScript)

使用 pre-commit (Python)

成功标准

提交前成功

创建 PR 前成功

合并前成功

相关技能

🇺🇸English

Pre-Merge Verification

When to Use This Skill

Pre-Commit Verification

Commands by Language

Pre-PR Verification

Required Information

Security Checklist (if API changes)

Database Changes (if schema changes)

UI Changes (if applicable)

Pre-Merge Verification

CI/CD Checks

Functional Verification

Documentation

PR Description Template

Common Pitfalls to Avoid

Pre-Commit

Pre-PR

Pre-Merge

Quick Verification Script

Automation with Git Hooks

Using Husky (JavaScript/TypeScript)

Using pre-commit (Python)

Success Criteria

Pre-Commit Success

Pre-PR Success

Pre-Merge Success

Related Skills

最新 Skills