[FEATURE] Better "fix merge conflict"

Preflight Checklist

• [x] I have searched existing requests and this feature hasn't been requested yet
• [x] This is a single feature request (not multiple features)

Problem Statement

When I ask Claude to resolve a merge conflict, then I have noticed that the result is often not what I want.

Please improve Claud ability to solve git merge conflicts.

Proposed Solution

do it smarter: Compare changes of local branch to common parent commit. Compare changes of remote to common parent commit. The detect changes which should be in local branch. Detect which changes were done on the remote branch. Then think about that, and solve it.

Alternative Solutions

...

Priority

High - Significant impact on productivity

Feature Category

Developer tools/SDK

Use Case Example

1. git merge origin/main
2. get conflict
3. tell Claude to solve it.
4. result should be good.

Additional Context

.