Resolve Git conflicts without losing either side.
Resolves Git merge conflicts through an approved plan that preserves both branches' intent and validates the merged code.
When to use it
Use immediately when the user mentions merge conflicts that need resolving.
Give it a project with merge conflicts; it requests approval for a resolution plan, resolves the conflicts, tests, and commits the changes.
What you provide
No setup requirements listed.
No additional actions listed.