lmiranda
7c8a20c804
Refactored commands to extract reusable skills following the Commands → Skills separation pattern. Each command is now <50 lines and references skill files for detailed knowledge. Plugins refactored: - claude-config-maintainer: 5 commands → 7 skills - code-sentinel: 3 commands → 2 skills - contract-validator: 5 commands → 6 skills - data-platform: 10 commands → 6 skills - doc-guardian: 5 commands → 6 skills (replaced nested dir) - git-flow: 8 commands → 7 skills Skills contain: workflows, validation rules, conventions, reference data, tool documentation Commands now contain: YAML frontmatter, agent assignment, skills list, brief workflow steps, parameters Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
106 lines
2.4 KiB
Markdown
106 lines
2.4 KiB
Markdown
# Git Safety
|
|
|
|
## Purpose
|
|
|
|
Defines protected branches, destructive command warnings, and safety checks to prevent accidental data loss.
|
|
|
|
## When to Use
|
|
|
|
- Before any commit, push, or merge operation
|
|
- When user attempts to work on protected branches
|
|
- Before executing destructive commands
|
|
|
|
## Protected Branches
|
|
|
|
Default protected branches (configurable via `GIT_PROTECTED_BRANCHES`):
|
|
- `main`
|
|
- `master`
|
|
- `development`
|
|
- `staging`
|
|
- `production`
|
|
|
|
## Protection Rules
|
|
|
|
| Action | Behavior |
|
|
|--------|----------|
|
|
| Direct commit | Warn and offer to create feature branch |
|
|
| Force push | Require explicit confirmation |
|
|
| Deletion | Block completely |
|
|
| Merge into | Allow with standard workflow |
|
|
|
|
## Protected Branch Warning
|
|
|
|
When committing on protected branch:
|
|
|
|
```
|
|
You are on a protected branch: development
|
|
|
|
Protected branches typically have push restrictions that will prevent
|
|
direct commits from being pushed to the remote.
|
|
|
|
Options:
|
|
1. Create a feature branch and continue (Recommended)
|
|
2. Continue on this branch anyway (may fail on push)
|
|
3. Cancel
|
|
```
|
|
|
|
## Destructive Commands
|
|
|
|
Commands requiring extra confirmation:
|
|
|
|
| Command | Risk | Mitigation |
|
|
|---------|------|------------|
|
|
| `git push --force` | Overwrites remote history | Use `--force-with-lease` |
|
|
| `git reset --hard` | Loses uncommitted changes | Warn about unsaved work |
|
|
| `git branch -D` | Deletes unmerged branch | Confirm branch name |
|
|
| `git clean -fd` | Deletes untracked files | List files first |
|
|
|
|
## Safe Alternatives
|
|
|
|
| Risky | Safe Alternative |
|
|
|-------|------------------|
|
|
| `git push --force` | `git push --force-with-lease` |
|
|
| `git branch -D` | `git branch -d` (merged only) |
|
|
| `git reset --hard` | `git stash` first |
|
|
| `git checkout .` | Review changes first |
|
|
|
|
## Branch Deletion Safety
|
|
|
|
**Merged branches (`-d`):**
|
|
```bash
|
|
git branch -d feat/old-feature # Safe: only deletes if merged
|
|
```
|
|
|
|
**Unmerged branches (`-D`):**
|
|
```bash
|
|
# Requires confirmation
|
|
git branch -D feat/abandoned # Force: deletes regardless
|
|
```
|
|
|
|
## Push Rejection Handling
|
|
|
|
When push fails on protected branch:
|
|
|
|
```
|
|
Push rejected: Remote protection rules prevent direct push to development.
|
|
|
|
Options:
|
|
1. Create a pull request instead (Recommended)
|
|
2. Review branch protection settings
|
|
3. Cancel
|
|
```
|
|
|
|
## Stale Branch Detection
|
|
|
|
Branches with deleted remotes:
|
|
```bash
|
|
git branch -vv | grep ': gone]'
|
|
```
|
|
|
|
These are safe to delete locally with `-D` after confirmation.
|
|
|
|
## Related Skills
|
|
|
|
- skills/branch-naming.md
|
|
- skills/merge-workflow.md
|