Agentic Merge Conflict Resolution via goose --merge-conflict

[tanish111]

Add a CLI feature to Goose CLI:

goose --merge-conflict

What it does:

1. Users can run this whenever a merge conflict happens during a merge or pull process.
2. Asks the user: prefer HEAD, INCOMING, or MERGE BOTH.
3. Sends both versions + custom prompt to an LLM.
4. Resolves and rewrites the conflict file removing markers.
5. Merges logic where possible; if not, keeps the preferred side but retains max info from the other.
6. User continues with merge as usual.

Why this matters:

1. This will appeal to many less experienced Git users — especially those working on school, college, or personal projects — where merge conflicts often feel intimidating. Currently, no other agent handles this natively; existing solutions rely on complex workarounds.
2. This is the first step toward agentic collaboration in Goose — where in future at least 2 Goose agents can negotiate, merge, and ship code autonomously(in simple words 2 goose agents can work together just like a team of developers working together on same codebase a baby step towards creating fleet of goose agents).

Motivation

Discussion in Git Mailing List