Merge Strategy

Git merge strategies, conflict resolution approaches, merge vs rebase recommendations, and branch integration patterns in sidecar. Covers pull strategy menu, direct merge workflow, squash merge, commit message templates, configurable defaults, and protected branches. Use when working on git merge features or making decisions about merge strategies.

marcus Updated 1.1k repo stars
Sidecar

File contents

marcus/sidecar commit 0e34c142fc

Frequently asked questions

npx get-skill add marcus/merge-strategy