skills.rest
icartsh
icartshCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-advanced

Resolve merge conflicts and rewrite Git history with interactive rebasing.

4|Updated Dec 7, 2025
Search Tags:#git#bisect#conflicts#rebasing#branch-strategy
One-click install
npx skills add https://github.com/icartsh/icartsh_plugin --skill git-advanced-icartsh
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-advanced
Source: https://github.com/icartsh/icartsh_plugin/tree/main/icartsh-plugin/skills/git-advanced
Command: npx skills add https://github.com/icartsh/icartsh_plugin --skill git-advanced-icartsh

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill covers advanced Git workflows, reconciliation of merge conflicts, interactive rebasing, and branch management strategies.

Core Features & Use Cases

  • Interactive rebasing: squashing, reordering, and editing commits
  • Conflict resolution: strategy guidance and tool-assisted fixes
  • Branch strategy: Git Flow, trunk-based, and feature workflows
  • History safety: reflog recovery and careful history rewriting

Quick Start

Use the git_helper.sh script for common tasks, or consult branch_strategies.md and interactive_rebase.md examples.

Frequently Asked Questions about git-advanced

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

FAQPage Schema
How do I resolve merge conflicts when rebasing branches?▼

Conflict resolution during rebasing involves identifying conflicted files, manually editing them to reconcile changes, then staging and continuing the rebase. This Skill covers strategy guidance and tool-assisted approaches to safely merge divergent histories without losing work.

What's the best way to clean up and reorganize commits before merging?▼

Interactive rebasing lets you squash, reorder, and edit commits to create a clean history. This Skill provides step-by-step examples and helper scripts to restructure your commit timeline safely while preserving authorship and integrity.

How do I implement a sustainable branching strategy across my team?▼

Git Flow, trunk-based development, and feature workflows each suit different team sizes and release cycles. This Skill compares branch strategies, explains when to use each, and provides automation scripts for consistent branch management and cleanup.

Can I recover lost commits or changes using Git's history tools?▼

Reflog and bisect enable recovery of discarded commits and pinpoint bugs in your history. This Skill covers reflog recovery techniques and bisect-based bug hunting to restore work and trace when issues were introduced.

What precautions should I take when rewriting shared Git history?▼

History rewrites like force-push risk breaking teammates' work if not coordinated. This Skill emphasizes safety practices, stash management, and when to avoid rewriting history on shared branches to prevent merge conflicts downstream.

Related Skills

Explore More Software Engineering Skills→
dyoshikawadyoshikawa
1

diff-analyze

Analyze git differences and commit history between the current branch and origin main.

Community
Basic
JacobPEvansJacobPEvans
3

rebase-pr

Rebase pull requests onto main with signed commits and GitHub API checks.

Community
Advanced
pedronauckpedronauck
567

git-rebase

Rebase Git branches onto main with conflict analysis and resolution strategies.

Community
Advanced
schpetschpet
5

jjwf

Guide Jujutsu (jj) workflow commands for status, diff, commit, and push operations.

Community
Intermediate