🤖 Git with AI — Version Control

When you ask Claude to commit, it analyzes the diff, identifies the type of change (feat, fix, refactor, docs, etc.), and generates a message in the conventional commits. This keeps the history readable and makes automatic changelogs easier.

# Peca ao Claude para commitar as mudancas atuais
# Ele vai:
# 1. Rodar git status e git diff
# 2. Analisar o que mudou
# 3. Gerar mensagem semantica
# 4. Commitar com a mensagem

# Prompt: "commita essas mudancas com mensagem semantica"
# Output: git commit -m "feat(auth): add JWT refresh token rotation"

Claude prefers adding specific files to staging (git add arquivo.ts) instead of git add -A. It groups logically related files into a single commit, creating atomic commits where each one represents a single coherent change. This is critical: if you need to revert, you revert one logical unit, not a blob of mixed changes.

Before committing, ask Claude: "review the current diff". It runs git diff --staged, analyzes the changes, and reports potential bugs, style inconsistencies, broken logic, and missing imports. It’s like having an instant code reviewer before every commit.

# Pedir review do diff antes de commitar
git diff --staged | head -200
# Prompt: "analisa esse diff e me diz se tem algum problema"

Merge conflicts are version control’s nightmare. With Claude, you can ask: "resolve the merge conflicts in file X". It understands the semantic context on both sides; it doesn’t resolve things mechanically (accept one side or the other), but integrates the intents of both branches. For complex conflicts, it may ask which behavior you prefer.

With AI in your workflow, short-lived branches work better. The pattern: create a branch for each feature/fix, let Claude work on it, and merge quickly. Long-lived branches accumulate divergence and make the agent's work harder. Prefer feat/add-auth that lasts 1-2 days to develop that accumulates over weeks.

Claude Code has built-in safety rules: it never commit .env files, credentials, or keys without explicit notice. But you should also keep your .gitignore up to date. Ask Claude to audit: "check whether there's any secret that isn't in .gitignore". Prevention is better than remedying a credential leak.