skills.rest
aegntic
aegnticCOMMUNITY
Explore all skills by this author →
Website𝕏@aegnticGitHub

git-expert

Provides Git guidance on branching, merging, conflict resolution, and recovery via built-in tools.

4|1|Updated Mar 3, 2026
Search Tags:#git#version control#branching#code management#merge conflicts#rebasing
One-click install
npx skills add https://github.com/aegntic/clawreform --skill git-expert-aegntic
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-expert
Source: https://github.com/aegntic/clawreform/tree/main/crates/clawreform-skills/bundled/git-expert
Command: npx skills add https://github.com/aegntic/clawreform --skill git-expert-aegntic

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps users manage Git repositories efficiently, resolve complex merge conflicts, and implement robust branching strategies, preventing data loss and streamlining collaboration.

Core Features & Use Cases

  • Branching Strategies: Guides users on choosing and implementing effective branching models like Trunk-Based, Git Flow, or GitHub Flow.
  • Rebasing and Merging: Provides detailed instructions on using git rebase and git merge for clean and manageable commit histories.
  • Conflict Resolution: Offers step-by-step guidance on identifying, resolving, and continuing after merge conflicts.
  • Recovery Techniques: Explains how to use git reflog and git reset to recover from accidental commits or deletions.
  • Use Case: A developer is struggling to merge a feature branch due to multiple conflicts. This Skill can guide them through the resolution process, ensuring the feature is integrated correctly without losing work.

Quick Start

Use the git-expert skill to help me resolve the current merge conflicts in my repository.

Frequently Asked Questions about git-expert

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

FAQPage Schema
How do I resolve merge conflicts in Git when rebasing a feature branch?▼

To resolve Git merge conflicts during a rebase, identify conflicting files, edit them to keep desired changes, stage them with git add, and run git rebase --continue. This Skill provides step-by-step guidance to ensure your feature branch integrates cleanly without losing work.

What's the best way to choose a branching strategy like Git Flow or Trunk-Based development?▼

The best Git branching strategy depends on your release cadence. This Skill helps you compare Git Flow, Trunk-Based, and GitHub Flow, guiding you to implement the model that streamlines collaboration and prevents repository history issues.

Can I recover lost commits after an accidental git reset or branch deletion?▼

Yes, you can recover lost commits after an accidental git reset or deletion by using git reflog to find the commit hash and git reset to restore it. This Skill explains these recovery techniques to prevent data loss.

How does git rebase compare to git merge for keeping a clean commit history?▼

Git rebase rewrites commit history to create a linear progression, while git merge preserves historical context with a merge commit. This Skill provides detailed instructions on using both to maintain a clean and manageable commit history.

Do I need prior Git command knowledge to use this Skill for repository management?▼

Yes, you need a foundational understanding of Git commands and workflows for effective application. This Skill provides expert guidance on complex operations like rebasing and conflict resolution, but requires prerequisite knowledge to execute safely.

Related Skills

Explore More Software Engineering Skills→
ChainGPT-orgChainGPT-org
13

chaingpt-update

Detect, review, and apply remote updates to the ChainGPT skill.

Official
Advanced
bdsqqqbdsqqq
59

git-ship

Stage modified files, commit with conventional commits, and push to the remote repository.

Community
Intermediate
mcj-codermcj-coder
1

branching-strategy-and-conventions

Configure Git branching strategies, Conventional Commits, and merge rules.

Community
Advanced
julianobarbosajulianobarbosa
7

vault-structure

Execute advanced Git workflows including rebasing, cherry-picking, bisecting, and worktrees.

Community
Advanced