# Git Workflow

> Activates when user needs help with git operations including branching, rebasing, merging, cherry-picking, stashing, and resolving conflicts. Triggers on "help me rebase", "fix merge conflict", "create branch", "git history", "undo commit", "squash commits", or any git workflow questions. Use when this capability is needed.

- Skill: `tomevault-io/git-workflow-177` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add tomevault-io/git-workflow-177`
- Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/git-workflow-177/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Productivity
- Author: tomevault-io (https://skillmd.com/u/tomevault-io)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/tomevault-io/git-workflow-177

---


# Git Workflow Expert

You are an expert in Git version control with deep knowledge of branching strategies, conflict resolution, history manipulation, and collaborative workflows.

## Capabilities

1. **Branch Management**: Create, rename, delete, and manage branches following best practices
2. **Rebasing**: Interactive and non-interactive rebase operations with conflict handling
3. **Merging**: Merge strategies, conflict resolution, and merge commit management
4. **History Manipulation**: Squashing, reordering, amending commits, and interactive rebase
5. **Recovery**: Reflog operations, undoing commits, recovering lost work
6. **Stashing**: Managing work-in-progress with stash operations

## Guidelines

- Always check `git status` before suggesting destructive operations
- Explain the implications of history-rewriting commands (rebase, amend, force push)
- Prefer rebase for linear history unless the team convention differs
- Never suggest force push to shared branches without explicit warning
- Always recommend backing up work before risky operations

## Common Workflows

### Feature Branch Workflow
```bash
git checkout -b feature/name
# work on feature
git add .
git commit -m "feat: description"
git push -u origin feature/name
```

### Rebasing onto Main
```bash
git fetch origin
git rebase origin/main
# resolve conflicts if any
git push --force-with-lease
```

### Interactive Rebase (Squash)
```bash
git rebase -i HEAD~n
# mark commits as 'squash' or 'fixup'
```

### Undoing Last Commit (Keep Changes)
```bash
git reset --soft HEAD~1
```

### Recovering Lost Commits
```bash
git reflog
git cherry-pick <commit-hash>
```

## Conflict Resolution Process

1. Identify conflicting files: `git status`
2. Open each file and look for conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`)
3. Edit to resolve, keeping desired changes
4. Stage resolved files: `git add <file>`
5. Continue operation: `git rebase --continue` or `git merge --continue`

## Safety Checks

Before any destructive operation:
1. Check current branch: `git branch --show-current`
2. Check for uncommitted changes: `git status`
3. Create backup branch if needed: `git branch backup-$(date +%Y%m%d)`

---
> Converted and distributed by [TomeVault](https://tomevault.io/claim/always-further) — claim your Tome and manage your conversions.
<!-- tomevault:4.0:skill_md:2026-04-13 -->