Sharing Claude Code's .claude/ directory across a team — what to commit and what to keep personal
When you start sharing Claude Code's .claude/ directory across a team, which files belong in Git and which stay local? Here are the boundaries I've drawn after running it on four projects, plus a working .gitignore template.
When Claude Code Hits `index.lock` in VMs and CI: Three Workarounds That Actually Stick
When Claude Code freezes on `fatal: Unable to create '.git/index.lock'` inside a VM, container, or CI sandbox, here are three battle-tested workarounds — pick the one that matches the layer of failure you're actually hitting.
Auto-Generating Conventional Commits with Claude Code — Letting it Infer Type and Scope from the Diff
Are your commit messages starting to look like a wall of update and fix? Here's a small, stable setup that lets Claude Code read your staged diff and turn it into proper Conventional Commits.
Claude Code Stopped Mid-Task? A Practical Recovery Guide to Resume Work Safely
When Claude Code stops responding mid-task, the worst thing you can do is immediately retry. This guide walks you through a 5-step recovery process using git to confirm what was completed before resuming safely.
Parallel Development with Claude Code Worktrees
A practical look at running parallel tasks with Claude Code and Git worktrees. Learn how to isolate branches into separate directories so context switches stay cheap, with the rough edges I hit while actually running this day to day.
How to Auto-Resolve Git Conflicts with Claude Code — Merge and Rebase Strategies
Learn how to resolve Git merge conflicts efficiently using Claude Code. This guide covers 3-way merge fundamentals, rebase conflict handling, complex resolution patterns, and automation techniques with practical command examples.
Claude Code Worktree — Maximize Productivity with Parallel Development
Master parallel branch development with Claude Code's --worktree flag. Work on multiple features simultaneously without switching overhead.
Claude Code Worktree Guide — Safe Parallel Development Techniques
Learn how to use git worktree with Claude Code for safe parallel development. Work on multiple tasks simultaneously without branch switching.