Merge Conflicts

Resolve merge, rebase, or cherry-pick conflicts by preserving intended behavior from both sides and verifying the integrated result. Use when conflict markers or semantic integration failures exist.

zznabil Updated 1 repo stars

File contents

zznabil/lean-agent-skill-collection commit 7802fd1a1e

Frequently asked questions

npx get-skill add zznabil/merge-conflicts