Comment résoudre les conflits Git instantanément avec Claude Code

One of the most stressful tasks in team development is resolving merge conflicts. Claude Code understands the intent behind both sides and resolves conflicts automatically.

1. Hand Off the Conflict Directly

The simplest approach. When a conflict occurs, delegate entirely.

git merge feature/auth
# CONFLICT occurs

claude -p "
A git merge conflict occurred.
Check all conflicting files and integrate both changes correctly.

Policy:
- Preserve both changes (don't discard either side)
- Verify tests still pass after resolution
"

Claude Code reads the conflict markers (<<<<<<<, =======, >>>>>>>) and integrates both sides with understanding of intent.

2. Batch-Resolve Massive Conflicts

Long-lived branches can produce conflicts across dozens of files.

git merge main
# 30 files have conflicts

claude -p "
30 files have conflicts.
Use git diff --name-only --diff-filter=U to identify them,
then resolve all conflicts.

Priority:
1. Base on main branch changes
2. Preserve feature branch new code
3. Config files: prefer main
4. Test files: keep both sets of tests

After resolving, git add and verify with git status.
"

What takes a human half a day resolves in minutes.

3. Resolve Rebase Conflicts

Rebase conflicts require commit-by-commit resolution, which is especially tedious.

git rebase main
# 3 commits have conflicts

claude -p "
Conflicts occurred during rebase. Resolve them:
1. Fix the current conflict
2. git add resolved files
3. git rebase --continue
4. Repeat for next conflict
5. Continue until complete

Preserve each commit's intent while aligning with main.
"

4. Analyze Conflict Causes

Understanding why conflicts happen prevents future ones.

claude -p "
Analyze why these files have conflicts:
- src/services/AuthService.ts
- src/middleware/auth.ts

Use git log --oneline --all -- to check both branches' history.
Explain which changes collide and suggest prevention strategies.
"

5. package-lock.json Conflicts

These are impossible to resolve by hand.

claude -p "
package-lock.json has conflicts. Resolve with:
1. Accept one side: git checkout --theirs package-lock.json
2. Run npm install to regenerate
3. git add package-lock.json

If package.json also conflicts, resolve that first.
"

6. Auto-Test After Merge with Hooks

Auto-run tests after merge/rebase to verify resolution correctness.

{
  "hooks": {
    "PostToolUse": [
      {
        "matcher": "Bash(git merge*)|Bash(git rebase*)",
        "hooks": [
          { "type": "command", "command": "npm test" }
        ]
      }
    ]
  }
}

See Hooks Guide.

Prevent Conflicts with CLAUDE.md

Reduce conflicts by documenting rules in CLAUDE.md.

## Branch Strategy
- Feature branches cut from main
- 1 PR = 1 feature (split large PRs)
- No direct push to main

## Conflict-Prone Files
- src/config/routes.ts - pull latest main before editing
- package.json - dependency changes in separate PRs
- prisma/schema.prisma - one person at a time

See CLAUDE.md Best Practices and Team Collaboration Guide.

Conclusion

• Hand conflicts directly to Claude Code for instant resolution
• Batch-process massive conflicts across dozens of files
• Automate step-by-step rebase resolution
• Analyze conflict causes and get prevention advice
• Delegate package-lock.json resolution
• Auto-test after merge with Hooks
• Reduce conflicts with CLAUDE.md rules

Conflict resolution goes from “dreaded task” to “3-second delegation.” See Anthropic Claude Code docs.