# `CONFLICT (content): Merge conflict in … — Automatic merge failed; fix conflicts and then commit the result.`

**Where it appears:** Terminal

**What it means:** Two branches changed the exact same lines of a file in different ways, so Git is asking which version to keep.

## Likely causes

- Pulling changes from `main` after both `main` and your current branch edited the same file.
- Starting a new feature branch from an outdated local `main` instead of pulling first.

## Message for your agent

```text
Git stopped with a merge conflict. Show me both versions in plain words, tell me what you recommend keeping, and wait for my OK before resolving and committing.
```

**Prevention:** Pull `main` before starting every new branch, and keep each branch focused on one small task.

---
Source: [Agentic Makers](https://agenticmakers.app/en/help/errors/git-merge-conflict-in-file) · License: CC BY 4.0