git-expert

Name: git-expert
Availability: InStock
Author: LibreFang

Guide Git branching, rebasing, and conflict resolution workflows.

10|7|Updated Mar 14, 2026

Search Tags:#git #branching #workflows #version-control #conflicts #rebasing

Ready to run

npx skills add https://github.com/librefang/librefang-registry --skill git-expert-librefang

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-expert
Source: https://github.com/librefang/librefang-registry/tree/main/skills/git-expert
Command: npx skills add https://github.com/librefang/librefang-registry --skill git-expert-librefang

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflows often derail teams due to poor branching strategies, unsafe merges, and difficult conflict resolution on shared repositories.

Core Features & Use Cases

Branching strategies: trunk-based, Git Flow, and GitHub Flow with clear naming conventions.
Rebasing and merging: guidance for linear history, merge strategies, and safe force-push on non-shared branches.
Conflict resolution and recovery: step-by-step conflict handling, using reflog, stash, and rerere for recovery.
Use Case: A development team onboarding a feature branch and needing a clean, auditable history across releases.

Quick Start

Ask the AI to implement a safe feature-branch workflow with a clear merge strategy in your repository.

Frequently Asked Questions about git-expert

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

FAQPage Schema

What is the best way to resolve git merge conflicts on a shared repository?▼

The best way to resolve git merge conflicts on a shared repository involves step-by-step conflict handling using diff and merge tooling, alongside recovery techniques like reflog, stash, and rerere to safely manage and undo changes.

How do I safely rewrite git history with interactive rebasing?▼

You can safely rewrite git history with interactive rebasing by following safe-force guidance using --force-with-lease, ensuring non-shared branches maintain a clean, linear, and auditable history without overwriting remote changes.

What branching strategy should my team use for feature development?▼

Your team can choose between trunk-based, Git Flow, and GitHub Flow branching models depending on your release cadence, applying clear naming conventions to maintain an auditable history across releases.

How do I recover lost commits after a bad git rebase?▼

You recover lost commits after a bad git rebase by using the git reflog to find the previous HEAD state and resetting to it, utilizing stash and rerere configurations for comprehensive recovery.

When should I use force push on a remote branch?▼

You should use force push on a remote branch only on non-shared branches using --force-with-lease, preventing the accidental overwriting of collaborators' work while maintaining a linear history.