[Feature request] AI-assisted merge conflict resolution

[irov]

Please add AI-assisted merge conflict resolution to Fork.

Suggested workflow:

• open conflicted file in Fork
• click Resolve with AI
• get a proposed merged result using both sides of the conflict plus surrounding context
• review the diff
• accept, edit, or reject the suggestion

This would be very useful for refactors, renames, overlapping edits, and large rebases/cherry-picks.

Important points:

• diff preview before apply
• rollback to original conflicted state
• per-hunk and whole-file resolution
• privacy controls
• optional provider selection / custom instructions

This would reduce context switching to external editors and make Fork even better for daily merge workflows.

[DanPristupov]

That would be a very long blocking operation. I think it would be much more flexible if you open the terminal and run claude 'resolve conflicts'.

[irov]

I agree terminal-based tools are more flexible. Still, that does not remove the value of native AI conflict resolution in Fork. For many everyday cases, an in-app flow would be faster and more convenient than switching to terminal or external editors. It also does not need to be a long blocking operation if it is asynchronous, cancellable, and scoped to a file or selected hunks. So I see these as complementary workflows, not mutually exclusive ones.