Resolving Merge Conflicts

Resolve an active Git merge or rebase conflict by tracing both changes' intent, preserving compatible behavior, and verifying the combined result. Use when a merge or rebase has conflicts that need resolution.

tzachbon Updated 566 repo stars
Srulik Toolkit

File contents

tzachbon/srulik-toolkit commit 6847e2341e

Frequently asked questions

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