Does this skill support advanced conflict resolution?

Absolutely. It covers advanced merge strategies, the use of mergetools, and enabling 'rerere' (Reuse Recorded Resolution) to automate the resolution of repeated conflicts.

What is a Claude Code Skill?

A Claude Code Skill is a specialized capability that enhances Claude's behavior when performing specific tasks, providing domain-specific guidance, best practices, and implementation patterns.

Can I remove sensitive data from my Git history using this skill?

Yes, it includes modern methods for history manipulation using tools like git-filter-repo and BFG Repo-Cleaner to strip files or replace text across your entire commit history.

How does this skill help with complex Git rebasing?

It provides structured guidance for interactive rebases, allowing you to squash, reword, edit, or drop commits, as well as use advanced features like autosquash and commit reordering.

Git Advanced Operations

Name: Git Advanced Operations
Author: geoffjay

bygeoffjay

•

Deployment & DevOps

Automates and provides expert guidance for complex Git workflows, including history rewriting, interactive rebases, and advanced conflict resolution.

About

The Git Advanced Operations skill empowers developers to perform sophisticated repository management tasks with confidence. It provides a comprehensive suite of patterns for interactive rebases, commit surgery, and history manipulation, allowing users to clean messy histories, split large changes, and perform precise cherry-picking across branches. Ideal for maintaining high-quality project history and resolving complex merge conflicts, this skill serves as an expert companion for managing the most intricate aspects of version control and collaborative development workflows.

Key Features

Advanced history manipulation to remove sensitive data or large files
Interactive rebase strategies including squash, fixup, and commit reordering
Sophisticated merge strategies and conflict resolution with Rerere support
2 GitHub stars
Interactive staging for partial file commits and patch-level management
Commit surgery for amending messages, author info, and historical splitting

Use Cases

Resolving complex 3-way merge conflicts using specialized strategies like 'ours' or 'theirs'
Cleaning up messy feature branch history before merging into a main production branch
Removing accidentally committed secrets or large binary files from the entire repository history

About

Key Features

Advanced history manipulation to remove sensitive data or large files
Interactive rebase strategies including squash, fixup, and commit reordering
Sophisticated merge strategies and conflict resolution with Rerere support
2 GitHub stars
Interactive staging for partial file commits and patch-level management
Commit surgery for amending messages, author info, and historical splitting

Use Cases

Resolving complex 3-way merge conflicts using specialized strategies like 'ours' or 'theirs'
Cleaning up messy feature branch history before merging into a main production branch
Removing accidentally committed secrets or large binary files from the entire repository history