Resolving Merge Conflicts

Inspect or resolve an active conflicted merge, rebase, cherry-pick, revert, or unmerged index. Status, explanation, and review are read-only. Exclude operation planning or start, ordinary diffs, completed operations, marker-like text without Git conflict state, and post-operation bugs.

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

File contents

stevennitesh/programming-agent-skills commit 9c74afb135

Frequently asked questions

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