Loading...
Found 1 Skills
Resolve git merge and rebase conflicts semi-automatically. Classifies conflicts by type (DU/UD/UU/AA/DD), auto-resolves trivial ones, and applies context-aware resolution for the rest.