Skills
.Work. You
Rest

git-case-sensitivity-fix

Community

Fix macOS git pull/merge conflicts due to filename case changes.

Software Engineering#git#macos#filesystem#merge conflicts#case sensitivity
Authorwilliamw
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill resolves merge conflicts caused by case-insensitive filesystems on macOS, where git tracks case-sensitive files but the filesystem does not.

Core Features & Use Cases

  • Conflict Resolution: Handles merge conflicts resulting from case changes in filenames.
  • Filesystem Case Sensitivity: Designed for macOS's case-insensitive HFS+ or APFS filesystem.
  • Use Case: When you have merge conflicts on files with only case changes in their names after a remote branch renames them, this Skill can help resolve them.

Quick Start

Run the following commands to apply the fix:

git fetch origin
git reset --hard origin/main

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: git-case-sensitivity-fix
Download link: https://github.com/williamw/agent-skills/archive/main.zip#git-case-sensitivity-fix

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 620,000+ vetted skills library on demand.