Does this skill handle interactive rebasing?

Yes, it guides you through interactive rebase operations to squash, edit, or reorder commits while ensuring your repository remains stable.

How does it help with merge conflicts?

It automatically identifies conflicting files, explains the conflict markers, and provides a structured process to resolve, stage, and continue the operation.

Is it safe to use for destructive operations?

The skill includes built-in safety checks, such as verifying git status and recommending backup branches before executing any history-rewriting commands.

Can it help me recover lost work?

Absolutely. It uses the git reflog to identify and restore commits that may have been lost during hard resets or accidental branch deletions.

Does it support team-specific branching strategies?

Yes, it can adapt to various workflows including Feature Branch, Gitflow, or Trunk-based development depending on your project's needs.

Git Workflow Expert

Name: Git Workflow Expert
Author: always-further

byalways-further

•

Developer Tools

Streamlines complex version control operations including interactive rebasing, merge conflict resolution, and repository history management.

About

The Git Workflow skill transforms Claude into a version control specialist capable of handling intricate repository tasks with precision and safety. It provides expert guidance for branching strategies, interactive rebasing, and delicate merge conflict resolution while enforcing best practices like safety checks and automated backups. Whether you need to squash commits for a clean pull request, recover lost work using the reflog, or maintain a linear history through rebasing, this skill ensures your version control operations are executed correctly and safely.

Key Features

Interactive rebasing and commit history manipulation
Work recovery via reflog and undoing accidental commits
Automated safety checks and backup branch creation
1 GitHub stars
Step-by-step merge conflict identification and resolution
Best-practice branching and feature development workflows

Use Cases

Cleaning up messy commit history before merging a feature branch
Resolving complex conflicts during a rebase onto the main branch
Recovering lost code after an accidental git reset or branch deletion

About

Key Features

Interactive rebasing and commit history manipulation
Work recovery via reflog and undoing accidental commits
Automated safety checks and backup branch creation
1 GitHub stars
Step-by-step merge conflict identification and resolution
Best-practice branching and feature development workflows

Use Cases

Cleaning up messy commit history before merging a feature branch
Resolving complex conflicts during a rebase onto the main branch
Recovering lost code after an accidental git reset or branch deletion