Git Merge Conflict Resolution

Resolve Git merge/rebase conflicts with explicit intent tracking and post-resolution verification. Use when conflicts occur and intent-preserving resolution is required before integration; do not use for CI workflow design or application behavior implementation.

planifest Updated 0 repo stars

File contents

planifest/planifest-framework commit 03f2874e66

Frequently asked questions

npx get-skill add planifest/git-merge-conflict-resolution