Working with Git using Claude Code

Claude Code integrates deeply with Git, making version control effortless. It can create commits, manage branches, review diffs, resolve merge conflicts, and even create pull requests.

Smart Commits

Let Claude Code analyze your changes and write a commit message:

> Commit my current changes with a descriptive message

Claude Code will:

1. Run git status and git diff
2. Analyze all staged and unstaged changes
3. Write a clear, conventional commit message
4. Stage the appropriate files and create the commit

Branch Management

# Create a feature branch
> Create a new branch called feature/user-authentication

# Switch branches
> Switch to the main branch

# View branch info
> Show me all branches and which one I'm on

Reviewing Changes

Ask Claude Code to explain what changed:

# Review your uncommitted changes
> What changes have I made since the last commit?

# Review changes between branches
> What's different between my branch and main?

# Review a specific commit
> Explain what commit abc1234 changed and why

Resolving Merge Conflicts

Claude Code can handle merge conflicts for you:

> I have merge conflicts after rebasing on main. Can you resolve them?

Claude Code will read each conflicting file, understand both sides of the conflict, and make an intelligent resolution based on the intent of both changes.

Creating Pull Requests

Let Claude Code create a PR with a proper description:

> Create a pull request for my current branch against main

Claude Code will:

• Push your branch to the remote
• Analyze all commits since branching from main
• Write a descriptive PR title and body
• Create the PR using the GitHub CLI

PR Review

You can also ask Claude Code to review an existing PR:

# Review a specific PR
> /review 42

# Or provide the URL
> Review this PR: https://github.com/user/repo/pull/42

Undoing Mistakes

# Undo the last commit (keeping changes)
> Undo my last commit but keep the file changes

# Discard changes to a file
> Revert all changes to src/config.js

# Stash work in progress
> Stash my current changes so I can switch branches

Summary

Claude Code makes Git workflows smooth — from smart commits to merge conflict resolution to PR creation. Next, we’ll explore how to use Claude Code for writing tests.

Previous: Refactoring Code with Claude Code

Next: Writing Tests with Claude Code