skills.rest
williamw
williamwCOMMUNITY
Explore all skills by this author →
GitHub

git-case-sensitivity-fix

Resolve git merge conflicts from case-only file renames on macOS.

Updated Aug 23, 2026
Search Tags:#git#macos#filesystem#merge conflicts#case sensitivity
One-click install
npx skills add https://github.com/williamw/agent-skills --skill git-case-sensitivity-fix
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-case-sensitivity-fix
Source: https://github.com/williamw/agent-skills/tree/main/skills/git-case-sensitivity-fix
Command: npx skills add https://github.com/williamw/agent-skills --skill git-case-sensitivity-fix

SYSTEM DOCUMENTATION & REQUIREMENTS

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

Frequently Asked Questions about git-case-sensitivity-fix

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

FAQPage Schema
Why does git merge fail on macOS when only the filename casing changes?▼

Git merge fails on macOS because git tracks case-sensitive filenames internally, but macOS uses a case-insensitive filesystem (HFS+ or APFS), causing conflicts when a remote branch renames files by changing only their casing.

How do I fix git pull conflicts caused by case-sensitive filename renames on macOS?▼

To fix git pull conflicts from case-sensitive filename renames, fetch the remote branch and reset your local branch hard to the remote tracking branch, aligning your case-insensitive filesystem with the remote repository state.

Does this git case sensitivity fix work on case-sensitive APFS volumes?▼

No, this fix targets case-insensitive macOS filesystems like default HFS+ or APFS configurations where filename casing conflicts occur; case-sensitive volumes do not experience these specific git merge conflicts.

What's the best way to resolve case-only file rename conflicts during a git merge?▼

The best way to resolve case-only file rename conflicts is to fetch the remote branch and execute a hard reset to the remote tracking branch, forcibly syncing the local case-insensitive filesystem with the target repository state.

Will resetting my local branch delete uncommitted changes when fixing case sensitivity conflicts?▼

Yes, running a hard reset to the remote branch discards all uncommitted local changes and untracked file modifications to resolve the case sensitivity conflict, requiring a clean working directory before execution.

Related Skills

Explore More Software Engineering Skills→
Knuckles-TeamKnuckles-Team
2

git-status-reset

Inspect Git working directory state and reset or clean uncommitted changes.

Official
Intermediate
EdanStarfireEdanStarfire
15

git-state-validator

Validate Git repository state before branching, merging, or pulling.

Community
Basic
joyce820309joyce820309

using-git-worktrees

Create isolated Git worktrees for feature development workflows.

Community
Intermediate
robertolopezlopezrobertolopezlopez
1

git-rebase-conflict-resolver

Resolve Git rebase conflicts while preserving compatible changes and running validation checks.

Community
Advanced