merge-resolver

Resolve merge conflicts intelligently using git history. Fetches PR context, identifies conflicted files, uses git blame and commit history to infer developer intent. Applies resolution strategies bas

merge
resolver