git-workflow

Manage Git workflows, resolve conflicts, and safely rewrite history.

4|1|Updated Dec 31, 2025

Search Tags:#git #workflow #branching #merge #version-control #conflicts #rebasing

One-click install

npx skills add https://github.com/always-further/claude-extensions --skill git-workflow-always-further

Or copy as Structured Prompt for Agent▼

Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/always-further/claude-extensions/tree/main/skills/git-workflow
Command: npx skills add https://github.com/always-further/claude-extensions --skill git-workflow-always-further

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you manage Git workflows, resolve conflicts, and safely rewrite history with best practices.

Core Features & Use Cases

Branch & History: Create/rename/delete branches, squash commits, and rebase.
Merging & Conflicts: Merge strategies and guided conflict resolution.
Recovery & Safety: Reflog-based recovery and backup tips.

Quick Start

Create a feature branch, commit changes, push to origin, and rebase onto main, handling conflicts if any.