Resolve Git conflicts with both sides in mind.
What it does
Resolves ongoing Git merge or rebase conflicts while preserving both sides' intent where possible.
When to use it
Use when an ongoing Git merge or rebase has conflicts to resolve.
How to use it
Give it a project with an ongoing merge or rebase conflict; it resolves the conflicts, runs project checks, and completes the merge or rebase.
What you provide
- An existing project
Latest review
What you need · 0
No setup requirements listed.
Access · 2
This skill
pull requests
Read
Reads related pull requests
issues/tickets
Read
Reads original issues and tickets