docs: 重构命令和技能文档体系,规范化文档格式和内容组织

This commit is contained in:
2026-01-13 10:25:18 +08:00
parent 5a05d5ab53
commit f31f198407
19 changed files with 1055 additions and 2342 deletions

View File

@@ -2,84 +2,22 @@
description: Pull latest changes from remote repository
---
# git-pull
Pull the latest changes from the remote repository for the current branch.
Pull latest changes from remote repository for current branch.
Please perform the following tasks:
## What It Does
1. **Run `git pull`** to fetch and merge remote changes
2. **Handle merge conflicts if they occur:**
- Check conflict files with `git status`
- Guide me through conflict resolution
- Help stage resolved files with `git add <file>`
- Complete the merge with `git commit`
3. **Show the result** with branch status and changes summary
- Fetches latest changes from remote
- Merges remote changes into local branch
- Updates working directory
If there are any errors or conflicts, explain them clearly in Chinese and provide step-by-step guidance for resolution.
## Quick Start
Use this command to synchronize your local branch with the latest remote changes.
## Steps
### 1. Execute Pull
```bash
git pull
```
This command will:
- Fetch updates from remote repository
- Automatically merge changes into current branch
- Update your working directory
### 2. Handle Conflicts (if any)
If merge conflicts occur:
- Git will mark conflicting files
- Resolve conflicts manually
- Stage resolved files: `git add <file>`
- Complete merge: `git commit`
Or use: `/git-status` to check conflict status
### 3. Display Result
Show result message:
```
✓ 拉取成功
分支已更新至最新状态。
```
Or if conflicts:
```
⚠️ 发生合并冲突
请解决以下文件中的冲突:
- src/index.js
- README.md
然后运行:
git add <file>
git commit
或使用 /git-status 查看详细状态
```
## Use Cases
- Sync local branch with remote updates
- Get latest changes from team
- Before starting new feature work
- Before pushing your changes
## Related Commands
- `/git-status` - Check file changes and merge status
- `/git-push` - Push local changes to remote
- `/git-commit` - Commit local changes
## Notes
- Pulls from tracking remote branch (usually origin/main)
- Uses default merge strategy (recursive merge)
- If conflicts occur, resolve them before committing
Present the final result showing:
- Branch name
- Number of commits pulled
- Files changed
- Any conflicts that need attention