Resolving Merge Conflicts

Inspect or resolve conflicts in an active Git merge, rebase, cherry-pick, revert, or unmerged index. Exclude planning integrations and debugging completed merges.

stevennitesh Updated 1 repo stars
Programming Agent Skills: coding workflows, managed installation and recovery

File contents

stevennitesh/programming-agent-skills commit 49b7b1abbf

Frequently asked questions

npx get-skill add stevennitesh/resolving-merge-conflicts