skills.rest
RightNow-AI
RightNow-AIOFFICIAL
Explore all skills by this author →
Website𝕏@rightnowai_coGitHub

git-expert

Guide Git branching, rebasing, merging, and conflict resolution.

18.1k|2.3k|Updated Feb 24, 2026
Search Tags:#git#developer tools#version control#branching#merge conflicts#rebase
One-click install
npx skills add https://github.com/RightNow-AI/openfang --skill git-expert-rightnow-ai
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-expert
Source: https://github.com/RightNow-AI/openfang/tree/main/crates/openfang-skills/bundled/git-expert
Command: npx skills add https://github.com/RightNow-AI/openfang --skill git-expert-rightnow-ai

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps users navigate complex Git operations, resolve merge conflicts, and implement effective branching strategies, reducing errors and improving collaboration.

Core Features & Use Cases

  • Branching Strategies: Guidance on Trunk-based, Git Flow, and GitHub Flow.
  • Rebasing & Merging: Instructions for maintaining clean history and integrating changes.
  • Conflict Resolution: Step-by-step help for resolving merge conflicts.
  • Recovery Techniques: Methods to undo mistakes and recover lost work using git reflog.
  • Use Case: A developer is stuck with a merge conflict after pulling changes from a shared branch. They can consult this Skill for clear instructions on how to resolve it safely.

Quick Start

Use the git-expert skill to help me resolve a merge conflict in my current branch.

Frequently Asked Questions about git-expert

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

FAQPage Schema
How do I resolve a git merge conflict safely without losing changes?▼

To resolve a git merge conflict, identify conflicting files, edit to keep desired changes, stage resolved files, and commit. This skill provides step-by-step guidance for resolving conflicts and integrating changes safely.

What is the best way to maintain a clean git commit history?▼

Maintaining a clean git commit history requires rebasing instead of merging to linearize changes. This skill offers instructions for rebasing and merging to keep project histories organized.

How can I recover lost work or undo mistakes using git reflog?▼

Recover lost work using git reflog to find previous commit states and reset your branch accordingly. This skill details recovery techniques for undoing mistakes and retrieving lost commits.

What branching workflow should I use for my team?▼

Choosing a branching workflow depends on team size and release cadence, utilizing Trunk-based, Git Flow, or GitHub Flow. This skill guides implementing these branching strategies for effective collaboration.

When should I use git rebase instead of git merge?▼

Use git rebase to maintain a linear project history without merge commits, whereas git merge preserves the exact chronological context. This skill explains both methods for integrating changes effectively.

Related Skills

Explore More Software Engineering Skills→
lubusINlubusIN
48

frappe-project-triage

Identify Frappe project type, installed apps, version, and tooling.

Official
Intermediate
bdsqqqbdsqqq
59

git-ship

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

Community
Intermediate
etylsarinetylsarin
59

git-workflow

Enforce feature-branch pull request workflows and prevent direct commits to main.

Community
Intermediate
X-School-AcademyX-School-Academy
19

dev-swarm-git-merge

Merge specific files or directories and squash commits across Git branches.

Official
Intermediate