Resolve Merge Conflicts

Goal-aware resolution of rebase conflicts when merging a conflict-resolution worktree back into the integration branch. Analyzes the intent of each side of a conflict, resolves it in-place when confidence is HIGH or MEDIUM, and escalates when LOW.

TalonT-Org Updated 5 repo stars
AutoSkillit

File contents

TalonT-Org/AutoSkillit commit 110af0850c

Frequently asked questions

npx get-skill add talont-org/resolve-merge-conflicts