Git

Manage Git repositories, branches, commits, merges, rebases, and recovery workflows.

Updated Apr 8, 2026
One-click install
npx skills add https://github.com/LudwigAJ/swell --skill git-ludwigaj
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: Git
Source: https://github.com/LudwigAJ/swell/tree/main/.claude/skills/git
Command: npx skills add https://github.com/LudwigAJ/swell --skill git-ludwigaj

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you work with Git safely and consistently when you need to manage branches, commits, merges, rebases, and recovery without breaking shared history.

Core Features & Use Cases

  • Daily Version Control: Stage, commit, push, pull, and inspect changes with reliable command choices.
  • Branch and Merge Workflows: Create branches, rebase local work, merge cleanly, and handle pull request collaboration.
  • Recovery and Conflict Resolution: Resolve merge conflicts, recover lost commits with reflog, and undo mistakes with the least risky command.
  • Use Case: When a feature branch diverges from main and conflicts appear during review, use this Skill to rebase safely, resolve the conflict markers, and recover any lost work if the rewrite goes wrong.

Quick Start

Use the git skill to inspect my repository status and recommend the safest next Git action.

Frequently Asked Questions about Git

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve merge conflicts during a git rebase?

To resolve merge conflicts during a git rebase, you manually edit files containing conflict markers, stage corrected changes, and continue the rebase using safe recovery commands to preserve branch history.

What is the safest way to undo a git commit without losing changes?

The safest way to undo a git commit without losing changes is using a soft reset targeting the previous commit state while keeping your working directory intact, prioritizing the least risky command choices for reliable version control.

How do I recover lost commits after a bad git reset or branch deletion?

You can recover lost commits after a bad git reset or branch deletion by inspecting the git reflog to find the exact commit hash, then checking out or resetting to that reference point for reliable history recovery.

When should I use git rebase instead of a merge commit?

You should use git rebase instead of a merge commit when you need a linear project history for local feature branches before a pull request, while reserving merges for integrating reviewed branches into shared main.

How do I maintain branch hygiene when collaborating on pull requests?

You maintain branch hygiene when collaborating on pull requests by creating isolated feature branches, rebasing local work to resolve divergence, and applying clean merge workflows to avoid breaking shared history during integration.